From fb0396d064dcf0f21d2509489ba6430bf444fe9b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 31 Oct 2015 09:48:55 +0000 Subject: [PATCH] TestEIn 1.6j4 : - aggiornamento EgtInterface per modifiche gestione DB utensili. --- EgtInterface.vb | 135 +++++++++++++++++++++++++------------ My Project/AssemblyInfo.vb | 4 +- 2 files changed, 95 insertions(+), 44 deletions(-) diff --git a/EgtInterface.vb b/EgtInterface.vb index 6bda356..f34d9c5 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -5355,6 +5355,29 @@ Public Function EgtShowOnlyTable(ByVal bVal As Boolean) As Boolean End Function ' Tools Database + +Private Function EgtTdbGetToolNewName_32(ByVal sName As String, ByRef psNewName As IntPtr) As Boolean +End Function + +Private Function EgtTdbGetToolNewName_64(ByVal sName As String, ByRef psNewName As IntPtr) As Boolean +End Function +Public Function EgtTdbGetToolNewName(ByRef sName As String) As Boolean + Dim psNewName As IntPtr + Dim bOk As Boolean + If IntPtr.Size = 4 Then + bOk = EgtTdbGetToolNewName_32(sName, psNewName) + Else + bOk = EgtTdbGetToolNewName_64(sName, psNewName) + End If + If bOk Then + sName = Marshal.PtrToStringUni(psNewName) + EgtFreeMemory(psNewName) + Else + sName = String.Empty + End If + Return bOk +End Function + Private Function EgtTdbAddTool_32(ByVal sName As String, ByVal nType As Integer) As Boolean End Function @@ -5443,89 +5466,117 @@ Public Function EgtTdbGetNextTool(ByVal nFamily As Integer, ByRef sName As Strin Return bOk End Function - -Private Function EgtTdbSetToolParamInt_32(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean + +Private Function EgtTdbSetCurrTool_32(ByVal sName As String) As Boolean End Function - -Private Function EgtTdbSetToolParamInt_64(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean + +Private Function EgtTdbSetCurrTool_64(ByVal sName As String) As Boolean End Function -Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal nVal As Integer) As Boolean +Public Function EgtTdbSetCurrTool(ByVal sName As String) As Boolean If IntPtr.Size = 4 Then - Return EgtTdbSetToolParamInt_32(sName, nType, nVal) + Return EgtTdbSetCurrTool_32(sName) Else - Return EgtTdbSetToolParamInt_64(sName, nType, nVal) + Return EgtTdbSetCurrTool_64(sName) End If End Function - -Private Function EgtTdbSetToolParamDouble_32(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean + +Private Function EgtTdbSaveCurrTool_32() As Boolean End Function - -Private Function EgtTdbSetToolParamDouble_64(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean + +Private Function EgtTdbSaveCurrTool_64() As Boolean End Function -Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal dVal As Double) As Boolean +Public Function EgtTdbSaveCurrTool() As Boolean If IntPtr.Size = 4 Then - Return EgtTdbSetToolParamDouble_32(sName, nType, dVal) + Return EgtTdbSaveCurrTool_32() Else - Return EgtTdbSetToolParamDouble_64(sName, nType, dVal) + Return EgtTdbSaveCurrTool_64() End If End Function - -Private Function EgtTdbSetToolParamString_32(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean + +Private Function EgtTdbSetCurrToolParamInt_32(ByVal nType As Integer, ByVal nVal As Integer) As Boolean End Function - -Private Function EgtTdbSetToolParamString_64(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean + +Private Function EgtTdbSetCurrToolParamInt_64(ByVal nType As Integer, ByVal nVal As Integer) As Boolean End Function -Public Function EgtTdbSetToolParam(ByVal sName As String, ByVal nType As Integer, ByVal sVal As String) As Boolean +Public Function EgtTdbSetCurrToolParam(ByVal nType As Integer, ByVal nVal As Integer) As Boolean If IntPtr.Size = 4 Then - Return EgtTdbSetToolParamString_32(sName, nType, sVal) + Return EgtTdbSetCurrToolParamInt_32(nType, nVal) Else - Return EgtTdbSetToolParamString_64(sName, nType, sVal) + Return EgtTdbSetCurrToolParamInt_64(nType, nVal) End If End Function - -Private Function EgtTdbGetToolParamInt_32(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean + +Private Function EgtTdbSetCurrToolParamDouble_32(ByVal nType As Integer, ByVal dVal As Double) As Boolean End Function - -Private Function EgtTdbGetToolParamInt_64(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean + +Private Function EgtTdbSetCurrToolParamDouble_64(ByVal nType As Integer, ByVal dVal As Double) As Boolean End Function -Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef nVal As Integer) As Boolean +Public Function EgtTdbSetCurrToolParam(ByVal nType As Integer, ByVal dVal As Double) As Boolean If IntPtr.Size = 4 Then - Return EgtTdbGetToolParamInt_32(sName, nType, nVal) + Return EgtTdbSetCurrToolParamDouble_32(nType, dVal) Else - Return EgtTdbGetToolParamInt_64(sName, nType, nVal) + Return EgtTdbSetCurrToolParamDouble_64(nType, dVal) End If End Function - -Private Function EgtTdbGetToolParamDouble_32(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean + +Private Function EgtTdbSetCurrToolParamString_32(ByVal nType As Integer, ByVal sVal As String) As Boolean End Function - -Private Function EgtTdbGetToolParamDouble_64(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean + +Private Function EgtTdbSetCurrToolParamString_64(ByVal nType As Integer, ByVal sVal As String) As Boolean End Function -Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef dVal As Double) As Boolean +Public Function EgtTdbSetCurrToolParam(ByVal nType As Integer, ByVal sVal As String) As Boolean If IntPtr.Size = 4 Then - Return EgtTdbGetToolParamDouble_32(sName, nType, dVal) + Return EgtTdbSetCurrToolParamString_32(nType, sVal) Else - Return EgtTdbGetToolParamDouble_64(sName, nType, dVal) + Return EgtTdbSetCurrToolParamString_64(nType, sVal) End If End Function - -Private Function EgtTdbGetToolParamString_32(ByVal sName As String, ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean + +Private Function EgtTdbGetCurrToolParamInt_32(ByVal nType As Integer, ByRef nVal As Integer) As Boolean End Function - -Private Function EgtTdbGetToolParamString_64(ByVal sName As String, ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean + +Private Function EgtTdbGetCurrToolParamInt_64(ByVal nType As Integer, ByRef nVal As Integer) As Boolean End Function -Public Function EgtTdbGetToolParam(ByVal sName As String, ByVal nType As Integer, ByRef sVal As String) As Boolean +Public Function EgtTdbGetCurrToolParam(ByVal nType As Integer, ByRef nVal As Integer) As Boolean + If IntPtr.Size = 4 Then + Return EgtTdbGetCurrToolParamInt_32(nType, nVal) + Else + Return EgtTdbGetCurrToolParamInt_64(nType, nVal) + End If +End Function + + +Private Function EgtTdbGetCurrToolParamDouble_32(ByVal nType As Integer, ByRef dVal As Double) As Boolean +End Function + +Private Function EgtTdbGetCurrToolParamDouble_64(ByVal nType As Integer, ByRef dVal As Double) As Boolean +End Function +Public Function EgtTdbGetCurrToolParam(ByVal nType As Integer, ByRef dVal As Double) As Boolean + If IntPtr.Size = 4 Then + Return EgtTdbGetCurrToolParamDouble_32(nType, dVal) + Else + Return EgtTdbGetCurrToolParamDouble_64(nType, dVal) + End If +End Function + + +Private Function EgtTdbGetCurrToolParamString_32(ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean +End Function + +Private Function EgtTdbGetCurrToolParamString_64(ByVal nType As Integer, ByRef psVal As IntPtr) As Boolean +End Function +Public Function EgtTdbGetCurrToolParam(ByVal nType As Integer, ByRef sVal As String) As Boolean Dim psVal As IntPtr Dim bOk As Boolean If IntPtr.Size = 4 Then - bOk = EgtTdbGetToolParamString_32(sName, nType, psVal) + bOk = EgtTdbGetCurrToolParamString_32(nType, psVal) Else - bOk = EgtTdbGetToolParamString_64(sName, nType, psVal) + bOk = EgtTdbGetCurrToolParamString_64(nType, psVal) End If If bOk Then sVal = Marshal.PtrToStringUni(psVal) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index b93cbc4..e06f751 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: ' - - + +