From fb65e11003306ed5ddb9e91a40246df525e9b66c Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 5 May 2016 07:36:09 +0000
Subject: [PATCH] TestEIn 1.6p4 : - aggiornamento e ricompilazione.

---
 EgtInterface.vb            | 98 ++++++++++++++++++++++++++++++++++++++
 My Project/AssemblyInfo.vb |  4 +-
 2 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/EgtInterface.vb b/EgtInterface.vb
index a7eb735..8031a85 100644
--- a/EgtInterface.vb
+++ b/EgtInterface.vb
@@ -1393,6 +1393,20 @@ Public Function EgtDisableModified() As Boolean
    End If
 End Function
 
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetEnableModified")>
+Private Function EgtGetEnableModified_32() As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetEnableModified")>
+Private Function EgtGetEnableModified_64() As Boolean
+End Function
+Public Function EgtGetEnableModified() As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtGetEnableModified_32()
+   Else
+      Return EgtGetEnableModified_64()
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetModified")>
 Private Function EgtSetModified_32() As Boolean
 End Function
@@ -6461,6 +6475,18 @@ Public Function EgtGetTableArea(nInd As Integer, ByRef ptMin As Point3d, ByRef p
       Return EgtGetTableArea_64(nInd, ptMin, ptMax)
    End If
 End Function
+Public Function EgtGetTableArea(nInd As Integer, ByRef b3Box As BBox3d) As Boolean
+   b3Box.Setup()
+   Dim ptMin, ptMax As Point3d
+   If IntPtr.Size = 4 Then
+      If Not EgtGetTableArea_32(nInd, ptMin, ptMax) Then Return False
+   Else
+      If Not EgtGetTableArea_64(nInd, ptMin, ptMax) Then Return False
+   End If
+   b3Box.Add(ptMin)
+   b3Box.Add(ptMax)
+   Return True
+End Function
 
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtShowOnlyTable")>
 Private Function EgtShowOnlyTable_32(bVal As Boolean) As Boolean
@@ -7385,6 +7411,7 @@ Public Function EgtChangeOperationPhase(nId As Integer, nNewPhase As Integer) As
    End If
 End Function
 
+' Dispositions
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetPhaseDisposition")>
 Private Function EgtGetPhaseDisposition_32(nPhase As Integer) As Integer
 End Function
@@ -7399,6 +7426,20 @@ Public Function EgtGetPhaseDisposition(nPhase As Integer) As Integer
    End If
 End Function
 
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSpecialApplyDisposition")>
+Private Function EgtSpecialApplyDisposition_32(nId As Integer, bRecalc As Boolean) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSpecialApplyDisposition")>
+Private Function EgtSpecialApplyDisposition_64(nId As Integer, bRecalc As Boolean) As Boolean
+End Function
+Public Function EgtSpecialApplyDisposition(nId As Integer, bRecalc As Boolean) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtSpecialApplyDisposition_32(nId, bRecalc)
+   Else
+      Return EgtSpecialApplyDisposition_64(nId, bRecalc)
+   End If
+End Function
+
 ' Machinings
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddMachining")>
 Private Function EgtAddMachining_32(sName As String, sMachining As String) As Integer
@@ -7777,6 +7818,63 @@ Public Function EgtGenerate(sCncFile As String, sInfo As String) As Boolean
    End If
 End Function
 
+' Machine
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetBaseId")>
+Private Function EgtGetBaseId_32(sBase As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetBaseId")>
+Private Function EgtGetBaseId_64(sBase As String) As Integer
+End Function
+Public Function EgtGetBaseId(sBase As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetBaseId_32(sBase)
+   Else
+      Return EgtGetBaseId_64(sBase)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableId")>
+Private Function EgtGetTableId_32(sTable As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableId")>
+Private Function EgtGetTableId_64(sTable As String) As Integer
+End Function
+Public Function EgtGetTableId(sTable As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetTableId_32(sTable)
+   Else
+      Return EgtGetTableId_64(sTable)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetAxisId")>
+Private Function EgtGetAxisId_32(sAxis As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetAxisId")>
+Private Function EgtGetAxisId_64(sAxis As String) As Integer
+End Function
+Public Function EgtGetAxisId(sAxis As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetAxisId_32(sAxis)
+   Else
+      Return EgtGetAxisId_64(sAxis)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetHeadId")>
+Private Function EgtGetHeadId_32(sHead As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetHeadId")>
+Private Function EgtGetHeadId_64(sHead As String) As Integer
+End Function
+Public Function EgtGetHeadId(sHead As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetHeadId_32(sHead)
+   Else
+      Return EgtGetHeadId_64(sHead)
+   End If
+End Function
+
 ' Machine Calc
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCalcTool")>
 Private Function EgtSetCalcTool_32(sTool As String, sHead As String, nExit As Integer) As Boolean
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index d3d1bf4..08cf545 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
 ' utilizzando l'asterisco (*) come descritto di seguito:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.6.16.1")> 
-<Assembly: AssemblyFileVersion("1.6.16.1")> 
+<Assembly: AssemblyVersion("1.6.16.4")> 
+<Assembly: AssemblyFileVersion("1.6.16.4")>