From d9ca9110ba572c5f4258d4534bebaafbc0f8c85d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 20 May 2019 10:20:41 +0000
Subject: [PATCH] TestEIn : - aggiornamento per EgtInitMachMgr.

---
 ConstGen.vb     |  3 +++
 ConstIni.vb     |  1 +
 EgtInterface.vb | 24 +++++++++++++++++++-----
 Form1.vb        |  7 ++++++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ConstGen.vb b/ConstGen.vb
index d890154..39bb613 100644
--- a/ConstGen.vb
+++ b/ConstGen.vb
@@ -37,6 +37,9 @@ Public Const TEMP_DIR As String = "Temp"
 
 ' Sottodirettorio di default per le macchine
 Public Const MACHINES_DFL_DIR As String = "Machines"
+' Sottodirettorio di default per i costruttori disegni utensili
+Public Const TOOLMAKER_DFL_DIR As String = "ToolMakers"
+
 
 ' Costanti per Pack dei pezzi in Special
 Public Const PACK_MAX_X As Double = 2500
diff --git a/ConstIni.vb b/ConstIni.vb
index 0b014e8..749d039 100644
--- a/ConstIni.vb
+++ b/ConstIni.vb
@@ -91,6 +91,7 @@ Public Const K_DDFDEFAULTDIR As String = "DdfDefaultDir"
 
 Public Const S_MACH As String = "Mach"
 Public Const K_MACHINESDIR As String = "MachinesDir"
+Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
 
 Public Const S_MRUFILES As String = "MruFiles"
 Public Const S_MRUSCRIPTS As String = "MruScripts"
diff --git a/EgtInterface.vb b/EgtInterface.vb
index 7ab7b64..4aae891 100644
--- a/EgtInterface.vb
+++ b/EgtInterface.vb
@@ -7197,16 +7197,16 @@ End Function
 
 '---------- Machinings ---------------------------------------------------------
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtInitMachMgr"), SuppressUnmanagedCodeSecurity()>
-Private Function EgtInitMachMgr_32(sMachinesDir As String) As Boolean
+Private Function EgtInitMachMgr_32(sMachinesDir As String, sToolMakersDir As String) As Boolean
 End Function
 <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtInitMachMgr"), SuppressUnmanagedCodeSecurity()>
-Private Function EgtInitMachMgr_64(sMachinesDir As String) As Boolean
+Private Function EgtInitMachMgr_64(sMachinesDir As String, sToolMakersDir As String) As Boolean
 End Function
-Public Function EgtInitMachMgr(sMachinesDir As String) As Boolean
+Public Function EgtInitMachMgr(sMachinesDir As String, sToolMakersDir As String) As Boolean
    If IntPtr.Size = 4 Then
-      Return EgtInitMachMgr_32(sMachinesDir)
+      Return EgtInitMachMgr_32(sMachinesDir, sToolMakersDir)
    Else
-      Return EgtInitMachMgr_64(sMachinesDir)
+      Return EgtInitMachMgr_64(sMachinesDir, sToolMakersDir)
    End If
 End Function
 
@@ -8549,6 +8549,20 @@ End Function
       End If
    End Function
 
+   <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbCurrToolDraw"), SuppressUnmanagedCodeSecurity()>
+   Private Function EgtTdbCurrToolDraw_32( nGenCtx As Integer, nToolCtx As Integer) As Integer
+   End Function
+   <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbCurrToolDraw"), SuppressUnmanagedCodeSecurity()>
+   Private Function EgtTdbCurrToolDraw_64( nGenCtx As Integer, nToolCtx As Integer) As Integer
+   End Function
+   Public Function EgtTdbCurrToolDraw( nGenCtx As Integer, nToolCtx As Integer) As Integer
+      If IntPtr.Size = 4 Then
+         Return EgtTdbCurrToolDraw_32( nGenCtx, nToolCtx)
+      Else
+         Return EgtTdbCurrToolDraw_64( nGenCtx, nToolCtx)
+      End If
+   End Function
+
    <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbReload"), SuppressUnmanagedCodeSecurity()>
    Private Function EgtTdbReload_32() As Boolean
    End Function
diff --git a/Form1.vb b/Form1.vb
index fac1b71..bd9e53e 100644
--- a/Form1.vb
+++ b/Form1.vb
@@ -30,6 +30,7 @@ Public Class Form1
    Private m_sConfigDir As String = String.Empty
    Private m_sTempDir As String = String.Empty
    Private m_sMachinesRoot As String = String.Empty
+   Private m_sToolMakersDir As String = String.Empty
    Private m_sIniFile As String = String.Empty
    Private m_nDebug As Integer = 0
    Private m_nUserLevel As Integer = 1
@@ -105,6 +106,10 @@ Public Class Form1
       If GetPrivateProfileString(S_MACH, K_MACHINESDIR, "", m_sMachinesRoot, m_sIniFile) = 0 Then
          m_sMachinesRoot = m_sDataRoot & "\" & MACHINES_DFL_DIR
       End If
+      ' Impostazione direttorio toolmakers
+      If GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", m_sToolMakersDir, m_sIniFile) = 0 Then
+         m_sToolMakersDir = m_sDataRoot & "\" & TOOLMAKER_DFL_DIR
+      End If
       ' Verifico indice di istanza
       ManageIstance()
       ' Leggo e imposto chiave di protezione
@@ -199,7 +204,7 @@ Public Class Form1
       Dim hMainWnd As IntPtr = Me.Handle
       EgtSetMainWindowHandle(hMainWnd)
       ' inizializzo gestore lavorazioni
-      EgtInitMachMgr(m_sMachinesRoot)
+      EgtInitMachMgr(m_sMachinesRoot, m_sToolMakersDir)
       ' imposto unità di misura per interfaccia utente
       m_bMmUnits = (GetPrivateProfileInt(S_SCENE, K_MMUNITS, 1, m_sIniFile) <> 0)
       UpdateStatusUnits()