TestEIn 1.6p1 :

- ricompilazione e aggiornamento interfaccia.
2016-04-13 06:39:49 +00:00
parent 1c737aaab7
commit 90b0d9dce4
2 changed files with 123 additions and 8 deletions
@@ -3801,12 +3801,12 @@ Public Function EgtCopyGlob(nId As Integer, nRefId As Integer, Optional nSonBefo
 End Function

 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRelocate")>
-Private Function EgtRelocate_32(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Private Function EgtRelocate_32(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
 End Function
 <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRelocate")>
-Private Function EgtRelocate_64(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Private Function EgtRelocate_64(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
 End Function
-Public Function EgtRelocate(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Public Function EgtRelocate(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
   If IntPtr.Size = 4 Then
      Return EgtRelocate_32(nId, nRefId, nSonBeforeAfter)
   Else
@@ -3815,12 +3815,12 @@ Public Function EgtRelocate(nId As Integer, nRefId As Integer, Optional nSonBefo
 End Function

 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRelocateGlob")>
-Private Function EgtRelocateGlob_32(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Private Function EgtRelocateGlob_32(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
 End Function
 <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRelocateGlob")>
-Private Function EgtRelocateGlob_64(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Private Function EgtRelocateGlob_64(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
 End Function
-Public Function EgtRelocateGlob(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Integer
+Public Function EgtRelocateGlob(nId As Integer, nRefId As Integer, Optional nSonBeforeAfter As GDB_POS = GDB_POS.LAST_SON) As Boolean
   If IntPtr.Size = 4 Then
      Return EgtRelocateGlob_32(nId, nRefId, nSonBeforeAfter)
   Else
@@ -7208,6 +7208,43 @@ Public Function EgtGetOperationPhase(nId As Integer) As Integer
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationName")>
+Private Function EgtGetOperationName_32(nId As Integer, ByRef psName As IntPtr) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationName")>
+Private Function EgtGetOperationName_64(nId As Integer, ByRef psName As IntPtr) As Boolean
+End Function
+Public Function EgtGetOperationName(nId As Integer, ByRef sName As String) As Boolean
+   Dim psName As IntPtr
+   Dim bOk As Boolean
+   If IntPtr.Size = 4 Then
+      bOk = EgtGetOperationName_32(nId, psName)
+   Else
+      bOk = EgtGetOperationName_64(nId, psName)
+   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:="EgtGetOperationId")>
+Private Function EgtGetOperationId_32(sName As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationId")>
+Private Function EgtGetOperationId_64(sName As String) As Integer
+End Function
+Public Function EgtGetOperationId(sName As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetOperationId_32(sName)
+   Else
+      Return EgtGetOperationId_64(sName)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveOperation")>
 Private Function EgtRemoveOperation_32(nId As Integer) As Boolean
 End Function
@@ -7363,6 +7400,34 @@ Public Function EgtGetPhaseDisposition(nPhase As Integer) As Integer
 End Function

 ' Machinings
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddMachining")>
+Private Function EgtAddMachining_32(sName As String, sMachining As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddMachining")>
+Private Function EgtAddMachining_64(sName As String, sMachining As String) As Integer
+End Function
+Public Function EgtAddMachining(sName As String, sMachining As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtAddMachining_32(sName, sMachining)
+   Else
+      Return EgtAddMachining_64(sName, sMachining)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateMachining")>
+Private Function EgtCreateMachining_32(sName As String, nType As Integer, sMachining As String) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateMachining")>
+Private Function EgtCreateMachining_64(sName As String, nType As Integer, sMachining As String) As Integer
+End Function
+Public Function EgtCreateMachining(sName As String, nType As Integer, sMachining As String) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtCreateMachining_32(sName, nType, sMachining)
+   Else
+      Return EgtCreateMachining_64(sName, nType, sMachining)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCurrMachining")>
 Private Function EgtSetCurrMachining_32(nId As Integer) As Boolean
 End Function
@@ -7433,6 +7498,32 @@ Public Function EgtSetMachiningParam(nType As Integer, sVal As String) As Boolea
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachiningGeometry")>
+Private Function EgtSetMachiningGeometry_32(nNumId As Integer, nId() As Integer, nSub() As Integer) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachiningGeometry")>
+Private Function EgtSetMachiningGeometry_64(nNumId As Integer, nId() As Integer, nSub() As Integer) As Boolean
+End Function
+Public Function EgtSetMachiningGeometry(nId() As Integer, nSub() As Integer) As Boolean
+   If nId.Length() <> nSub.Length() Then Return False
+   If IntPtr.Size = 4 Then
+      Return EgtSetMachiningGeometry_32(nId.Length(), nId, nSub)
+   Else
+      Return EgtSetMachiningGeometry_64(nId.Length(), nId, nSub)
+   End If
+End Function
+Public Function EgtSetMachiningGeometry(nId() As Integer) As Boolean
+   Dim nSub(nId.Length() - 1) As Integer
+   For I As Integer = 0 To nId.Length() - 1
+      nSub(I) = -1
+   Next
+   If IntPtr.Size = 4 Then
+      Return EgtSetMachiningGeometry_32(nId.Length(), nId, nSub)
+   Else
+      Return EgtSetMachiningGeometry_64(nId.Length(), nId, nSub)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtPreviewMachining")>
 Private Function EgtPreviewMachining_32(bRecalc As Boolean) As Boolean
 End Function
@@ -9536,6 +9627,8 @@ Public Enum MCH_OY As Integer
   MILLING = 2048
   POCKETING = 4096
   MORTISING = 8192
+   SAWROUGHING = 16384
+   SAWFINISHING = 32768
 End Enum
 'Costanti : tipi di lavorazioni (altre operazioni)
 Public Enum MCH_MY As Integer
@@ -9545,6 +9638,8 @@ Public Enum MCH_MY As Integer
   MILLING = MCH_OY.MILLING
   POCKETING = MCH_OY.POCKETING
   MORTISING = MCH_OY.MORTISING
+   SAWROUGHING = MCH_OY.SAWROUGHING
+   SAWFINISHING = MCH_OY.SAWFINISHING
 End Enum
 'Costanti : parametri generali delle lavorazioni
 Public Enum MCH_GP As Integer
@@ -9568,6 +9663,8 @@ Public Enum MCH_MP As Integer
   LEADOUTTYPE = 8197
   CURVEUSE = 8198
   STEPTYPE = 8199
+   SUBTYPE = 8200
+   LEADLINKTYPE = 8201
   SPEED = 16384
   FEED = 16385
   STARTFEED = 16386
@@ -9602,6 +9699,8 @@ Public Enum MCH_MP As Integer
   OFFSET = 16415
   STEPEXTARC = 16416
   STEPINTARC = 16417
+   SIDESTEP = 16418
+   VERTFEED = 16419
   NAME = 32768
   TOOL = 32769
   DEPTH_STR = 32770
@@ -9644,6 +9743,22 @@ Public Enum MCH_SAW_LO As Integer
   STRICT = 1
   EXT = 2
 End Enum
+'Costanti : tipi di ingresso/collegamento/uscita per sgrossatura con lama
+Public Enum MCH_SAWROU_LL As Integer
+   CENT = 0
+   EXT = 1
+End Enum
+'Costanti : tipo di finituta con lama
+Public Enum MCH_SAWFIN_SUB As Integer
+   ALONG = 0
+   ACROSS = 1
+End Enum
+'Costanti : tipi di ingresso/collegamento/uscita per finitura con lama
+Public Enum MCH_SAWFIN_LL As Integer
+   STD = 0
+   CENT = 1
+   EXT = 2
+End Enum
 'Costanti : stato movimento di simulazione
 Public Enum MCH_SIM As Integer
   OK = 0
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
 ' utilizzando l'asterisco (*) come descritto di seguito:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.6.15.3")> 
-<Assembly: AssemblyFileVersion("1.6.15.3")> 
+<Assembly: AssemblyVersion("1.6.16.1")> 
+<Assembly: AssemblyFileVersion("1.6.16.1")>