TestEIn 1.6k8 :

- aggiornamento.
2015-11-23 09:13:00 +00:00
parent 689a65aca5
commit 27c7d759a9
2 changed files with 81 additions and 21 deletions
@@ -5328,31 +5328,31 @@ Public Function EgtSetTable(ByVal sTable As String) As Boolean
   End If
 End Function

-<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableRef1")>
-Private Function EgtGetTableRef1_32(ByRef ptPos As Point3d) As Boolean
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableRef")>
+Private Function EgtGetTableRef_32(ByVal nInd As Integer, ByRef ptPos As Point3d) As Boolean
 End Function
-<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableRef1")>
-Private Function EgtGetTableRef1_64(ByRef ptPos As Point3d) As Boolean
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableRef")>
+Private Function EgtGetTableRef_64(ByVal nInd As Integer, ByRef ptPos As Point3d) As Boolean
 End Function
-Public Function EgtGetTableRef1(ByRef ptPos As Point3d) As Boolean
+Public Function EgtGetTableRef(ByVal nInd As Integer, ByRef ptPos As Point3d) As Boolean
   If IntPtr.Size = 4 Then
-      Return EgtGetTableRef1_32(ptPos)
+      Return EgtGetTableRef_32(nInd, ptPos)
   Else
-      Return EgtGetTableRef1_64(ptPos)
+      Return EgtGetTableRef_64(nInd, ptPos)
   End If
 End Function

-<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableArea1")>
-Private Function EgtGetTableArea1_32(ByRef nAreaId As Integer) As Boolean
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableArea")>
+Private Function EgtGetTableArea_32(ByVal nInd As Integer, ByRef ptMin As Point3d, ByRef ptMax As Point3d) As Boolean
 End Function
-<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableArea1")>
-Private Function EgtGetTableArea1_64(ByRef nAreaId As Integer) As Boolean
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableArea")>
+Private Function EgtGetTableArea_64(ByVal nInd As Integer, ByRef ptMin As Point3d, ByRef ptMax As Point3d) As Boolean
 End Function
-Public Function EgtGetTableArea1(ByRef nAreaId As Integer) As Boolean
+Public Function EgtGetTableArea(ByVal nInd As Integer, ByRef ptMin As Point3d, ByRef ptMax As Point3d) As Boolean
   If IntPtr.Size = 4 Then
-      Return EgtGetTableArea1_32(nAreaId)
+      Return EgtGetTableArea_32(nInd, ptMin, ptMax)
   Else
-      Return EgtGetTableArea1_64(nAreaId)
+      Return EgtGetTableArea_64(nInd, ptMin, ptMax)
   End If
 End Function

@@ -6017,6 +6017,21 @@ Public Function EgtMdbGetMachiningDir(ByRef sMachiningDir As String) As Boolean
   Return bOk
 End Function

+' Operations
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveAllOperations")>
+Private Function EgtRemoveAllOperations_32() As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveAllOperations")>
+Private Function EgtRemoveAllOperations_64() As Boolean
+End Function
+Public Function EgtRemoveAllOperations() As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtRemoveAllOperations_32()
+   Else
+      Return EgtRemoveAllOperations_64()
+   End If
+End Function
+
 ' Simulation
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStart")>
 Private Function EgtSimStart_32() As Boolean
@@ -6033,16 +6048,16 @@ Public Function EgtSimStart() As Boolean
 End Function

 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimMove")>
-Private Function EgtSimMove_32() As Boolean
+Private Function EgtSimMove_32(ByRef nStatus As Integer) As Boolean
 End Function
 <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimMove")>
-Private Function EgtSimMove_64() As Boolean
+Private Function EgtSimMove_64(ByRef nStatus As Integer) As Boolean
 End Function
-Public Function EgtSimMove() As Boolean
+Public Function EgtSimMove(ByRef nStatus As Integer) As Boolean
   If IntPtr.Size = 4 Then
-      Return EgtSimMove_32()
+      Return EgtSimMove_32(nStatus)
   Else
-      Return EgtSimMove_64()
+      Return EgtSimMove_64(nStatus)
   End If
 End Function

@@ -6060,6 +6075,29 @@ Public Function EgtSimHome() As Boolean
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimGetAxisInfoPos")>
+Private Function EgtSimGetAxisInfoPos_32(ByVal nInd As Integer, ByRef psName As IntPtr, ByRef dVal As Double) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimGetAxisInfoPos")>
+Private Function EgtSimGetAxisInfoPos_64(ByVal nInd As Integer, ByRef psName As IntPtr, ByRef dVal As Double) As Boolean
+End Function
+Public Function EgtSimGetAxisInfoPos(ByVal nInd As Integer, ByRef sName As String, ByRef dVal As Double) As Boolean
+   Dim psName As IntPtr
+   Dim bOk As Boolean
+   If IntPtr.Size = 4 Then
+      bOk = EgtSimGetAxisInfoPos_32(nInd, psName, dVal)
+   Else
+      bOk = EgtSimGetAxisInfoPos_64(nInd, psName, dVal)
+   End If
+   If bOk Then
+      sName = Marshal.PtrToStringUni(psName)
+      EgtFreeMemory(psName)
+   Else
+      sName = String.Empty
+   End If
+   Return bOk
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep")>
 Private Function EgtSimSetStep_32(ByVal dStep As Double) As Boolean
 End Function
@@ -6088,6 +6126,21 @@ Public Function EgtSimStop() As Boolean
   End If
 End Function

+' Generation
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGenerate")>
+Private Function EgtGenerate_32(ByVal sCncFile As String, ByVal sInfo As String) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGenerate")>
+Private Function EgtGenerate_64(ByVal sCncFile As String, ByVal sInfo As String) As Boolean
+End Function
+Public Function EgtGenerate(ByVal sCncFile As String, ByVal sInfo As String) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtGenerate_32(sCncFile, sInfo)
+   Else
+      Return EgtGenerate_64(sCncFile, sInfo)
+   End If
+End Function
+

 '---------- Scene --------------------------------------------------------------
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtInitScene")>
@@ -7747,5 +7800,12 @@ Public Enum MCH_MP As Integer
   TUUID = 32771
   UUID = 32772
 End Enum
+'Costanti : stato movimento di simulazione
+Public Enum MCH_SIM As Integer
+   OK = 0
+   END_ = 1
+   OUTSTROKE = 2
+   ERR = 3
+End Enum

 End Module
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
 ' utilizzando l'asterisco (*) come descritto di seguito:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.6.11.6")> 
-<Assembly: AssemblyFileVersion("1.6.11.6")> 
+<Assembly: AssemblyVersion("1.6.11.8")> 
+<Assembly: AssemblyFileVersion("1.6.11.8")>