TestEIn :

- aggiornamento.
2016-01-18 16:42:21 +00:00
parent 467c939fa2
commit ec983bbcb3
2 changed files with 133 additions and 5 deletions
@@ -2417,13 +2417,13 @@ Public Function EgtCreateTextEx(ByVal nParentId As Integer, ByRef ptP As Point3d
   End If
 End Function

-<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateTextEx")>
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateTextAdv")>
 Private Function EgtCreateTextAdv_32(ByVal nParentId As Integer, ByRef ptP As Point3d, ByVal dAngRotDeg As Double,
                                     ByVal sText As String, ByVal sFont As String, ByVal nW As Integer, ByVal bItalic As Boolean,
                                     ByVal dH As Double, ByVal dRat As Double, ByVal dAddAdv As Double, ByVal nInsPos As Integer,
                                     Optional ByVal nRefType As GDB_RT = GDB_RT.LOC) As Integer
 End Function
-<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateTextEx")>
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtCreateTextAdv")>
 Private Function EgtCreateTextAdv_64(ByVal nParentId As Integer, ByRef ptP As Point3d, ByVal dAngRotDeg As Double,
                                     ByVal sText As String, ByVal sFont As String, ByVal nW As Integer, ByVal bItalic As Boolean,
                                     ByVal dH As Double, ByVal dRat As Double, ByVal dAddAdv As Double, ByVal nInsPos As Integer,
@@ -6475,6 +6475,48 @@ Public Function EgtMdbGetMachiningDir(ByRef sMachiningDir As String) As Boolean
 End Function

 ' Operations
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetFirstOperation")>
+Private Function EgtGetFirstOperation_32() As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetFirstOperation")>
+Private Function EgtGetFirstOperation_64() As Integer
+End Function
+Public Function EgtGetFirstOperation() As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetFirstOperation_32()
+   Else
+      Return EgtGetFirstOperation_64()
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetNextOperation")>
+Private Function EgtGetNextOperation_32(ByVal nId As Integer) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetNextOperation")>
+Private Function EgtGetNextOperation_64(ByVal nId As Integer) As Integer
+End Function
+Public Function EgtGetNextOperation(ByVal nId As Integer) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetNextOperation_32(nId)
+   Else
+      Return EgtGetNextOperation_64(nId)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationType")>
+Private Function EgtGetOperationType_32(ByVal nId As Integer) As Integer
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationType")>
+Private Function EgtGetOperationType_64(ByVal nId As Integer) As Integer
+End Function
+Public Function EgtGetOperationType(ByVal nId As Integer) As Integer
+   If IntPtr.Size = 4 Then
+      Return EgtGetOperationType_32(nId)
+   Else
+      Return EgtGetOperationType_64(nId)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRemoveOperation")>
 Private Function EgtRemoveOperation_32(ByVal nId As Integer) As Boolean
 End Function
@@ -6517,6 +6559,20 @@ Public Function EgtSetOperationMode(ByVal nId As Integer, ByVal bActive As Boole
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationMode")>
+Private Function EgtGetOperationMode_32(ByVal nId As Integer) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationMode")>
+Private Function EgtGetOperationMode_64(ByVal nId As Integer) As Boolean
+End Function
+Public Function EgtGetOperationMode(ByVal nId As Integer) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtGetOperationMode_32(nId)
+   Else
+      Return EgtGetOperationMode_64(nId)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetAllOperationsMode")>
 Private Function EgtSetAllOperationsMode_32(ByVal bActive As Boolean) As Boolean
 End Function
@@ -6545,6 +6601,20 @@ Public Function EgtSetOperationStatus(ByVal nId As Integer, ByVal bShow As Boole
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationStatus")>
+Private Function EgtGetOperationStatus_32(ByVal nId As Integer) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOperationStatus")>
+Private Function EgtGetOperationStatus_64(ByVal nId As Integer) As Boolean
+End Function
+Public Function EgtGetOperationStatus(ByVal nId As Integer) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtGetOperationStatus_32(nId)
+   Else
+      Return EgtGetOperationStatus_64(nId)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetAllOperationsStatus")>
 Private Function EgtSetAllOperationsStatus_32(ByVal bShow As Boolean) As Boolean
 End Function
@@ -6751,6 +6821,43 @@ Public Function EgtGetCalcToolDirFromAngles(dAngA As Double, dAngB As Double, By
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtVerifyOutstroke")>
+Private Function EgtVerifyOutstroke_32(dX As Double, dY As Double, dZ As Double, dAngA As Double, dAngB As Double, ByRef nStat As Integer) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtVerifyOutstroke")>
+Private Function EgtVerifyOutstroke_64(dX As Double, dY As Double, dZ As Double, dAngA As Double, dAngB As Double, ByRef nStat As Integer) As Boolean
+End Function
+Public Function EgtVerifyOutstroke(dX As Double, dY As Double, dZ As Double, dAngA As Double, dAngB As Double, ByRef nStat As Integer) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtVerifyOutstroke_32(dX, dY, dZ, dAngA, dAngB, nStat)
+   Else
+      Return EgtVerifyOutstroke_64(dX, dY, dZ, dAngA, dAngB, nStat)
+   End If
+End Function
+
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOutstrokeInfo")>
+Private Function EgtGetOutstrokeInfo_32(ByRef psInfo As IntPtr) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetOutstrokeInfo")>
+Private Function EgtGetOutstrokeInfo_64(ByRef psInfo As IntPtr) As Boolean
+End Function
+Public Function EgtGetOutstrokeInfo(ByRef sInfo As String) As Boolean
+   Dim psInfo As IntPtr
+   Dim bOk As Boolean
+   If IntPtr.Size = 4 Then
+      bOk = EgtGetOutstrokeInfo_32(psInfo)
+   Else
+      bOk = EgtGetOutstrokeInfo_64(psInfo)
+   End If
+   If bOk Then
+      sInfo = Marshal.PtrToStringUni(psInfo)
+      EgtFreeMemory(psInfo)
+   Else
+      sInfo = String.Empty
+   End If
+   Return bOk
+End Function
+
 ' Machine Move
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetAxisPos")>
 Private Function EgtSetAxisPos_32(ByVal sAxis As String, ByVal dVal As Double) As Boolean
@@ -6766,6 +6873,20 @@ Public Function EgtSetAxisPos(ByVal sAxis As String, ByVal dVal As Double) As Bo
   End If
 End Function

+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachineLook")>
+Private Function EgtSetMachineLook_32(nFlag As Integer) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachineLook")>
+Private Function EgtSetMachineLook_64(nFlag As Integer) As Boolean
+End Function
+Public Function EgtSetMachineLook(nFlag As Integer) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtSetMachineLook_32(nFlag)
+   Else
+      Return EgtSetMachineLook_64(nFlag)
+   End If
+End Function
+

 '---------- Scene --------------------------------------------------------------
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtInitScene")>
@@ -8360,7 +8481,7 @@ Public Enum MCH_TP As Integer
   TCPOS = 32773
   UUID = 32774
 End Enum
-'Costanti : operazione di disposizione
+'Costanti : operazioni
 Public Enum MCH_OY As Integer
   NONE = 0
   DISP = 256
@@ -8436,5 +8557,12 @@ Public Enum MCH_SIM As Integer
   DIR_ERR = 4
   ERR = 5
 End Enum
+'Costanti : stato visualizzazione macchina
+Public Enum MCH_LOOK As Integer
+   TAB = 0
+   TAB_TOOL = 1
+   TAB_HEAD = 2
+   ALL = 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.12.8")> 
-<Assembly: AssemblyFileVersion("1.6.12.8")> 
+<Assembly: AssemblyVersion("1.6.12.9")> 
+<Assembly: AssemblyFileVersion("1.6.12.9")>