From dac261ff08957ef0344ce3edc5fabe96c6b2965f Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 18 Jul 2016 08:56:39 +0000
Subject: [PATCH] TestEIn 1.6s4 : - ricompilazione per aggiornamento
 interfaccia.

---
 EgtInterface.vb            | 31 ++++++++++++++++++++++++++++++-
 My Project/AssemblyInfo.vb |  4 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/EgtInterface.vb b/EgtInterface.vb
index 7b5f30b..07d3f54 100644
--- a/EgtInterface.vb
+++ b/EgtInterface.vb
@@ -7730,6 +7730,20 @@ Public Function EgtGetCurrMachining() As Integer
    End If
 End Function
 
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachiningParamBool")>
+Private Function EgtSetMachiningParamBool_32(nType As Integer, nVal As Boolean) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachiningParamBool")>
+Private Function EgtSetMachiningParamBool_64(nType As Integer, nVal As Boolean) As Boolean
+End Function
+Public Function EgtSetMachiningParam(nType As Integer, nVal As Boolean) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtSetMachiningParamBool_32(nType, nVal)
+   Else
+      Return EgtSetMachiningParamBool_64(nType, nVal)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetMachiningParamInt")>
 Private Function EgtSetMachiningParamInt_32(nType As Integer, nVal As Integer) As Boolean
 End Function
@@ -7826,6 +7840,20 @@ Public Function EgtApplyMachining(bRecalc As Boolean) As Boolean
    End If
 End Function
 
+<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachiningParamBool")>
+Private Function EgtGetMachiningParamBool_32(nType As Integer, ByRef bVal As Boolean) As Boolean
+End Function
+<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachiningParamBool")>
+Private Function EgtGetMachiningParamBool_64(nType As Integer, ByRef bVal As Boolean) As Boolean
+End Function
+Public Function EgtGetMachiningParam(nType As Integer, ByRef bVal As Boolean) As Boolean
+   If IntPtr.Size = 4 Then
+      Return EgtGetMachiningParamBool_32(nType, bVal)
+   Else
+      Return EgtGetMachiningParamBool_64(nType, bVal)
+   End If
+End Function
+
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachiningParamInt")>
 Private Function EgtGetMachiningParamInt_32(nType As Integer, ByRef nVal As Integer) As Boolean
 End Function
@@ -10179,7 +10207,8 @@ Public Enum MCH_MIL_LI As Integer
    LINEAR = 1
    TANGENT = 2
    GLIDE = 3
-   HELIX = 4
+   ZIGZAG = 4
+   HELIX = 5
 End Enum
    'Tipo di uscita
 Public Enum MCH_MIL_LO As Integer
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 27ea27f..b597c94 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.19.3")> 
-<Assembly: AssemblyFileVersion("1.6.19.3")> 
+<Assembly: AssemblyVersion("1.6.19.4")> 
+<Assembly: AssemblyFileVersion("1.6.19.4")>