From e232e38bd4d1afe890f832eaf55f78e6b5e9aaba Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 16 Jun 2020 15:57:47 +0000
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=20:=20-=20nelle=20note=20utente?=
 =?UTF-8?q?=20degli=20utensili=20=C3=A8=20possibile=20inserire=20TH=3DNome?=
 =?UTF-8?q?;=20per=20forzare=20l'uso=20del=20portautensili=20di=20nome=20s?=
 =?UTF-8?q?pecificato=20(deve=20essere=20nel=20direttorio=20opportuno).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MachMgrDBTools.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 7858d5f..40099ec 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -765,6 +765,10 @@ MachMgr::GetToolHolderPath( const string& sHeadName, int nExit, int nType) const
    Machine* pMch = GetCurrMachine() ;
    if ( pMch == nullptr)
       return false ;
+  // Recupero il direttorio dei portautensili
+   string sToolHolderDir ;
+   if ( ! TdbGetToolHolderDir( sToolHolderDir))
+      return "" ;
   // Recupero  file Ini della macchina
    string sMachIni = pMch->GetMachineDir() + "\\" + pMch->GetMachineName() + ".ini" ;
   // Recupero nome portautensile
@@ -798,13 +802,15 @@ MachMgr::GetToolHolderPath( const string& sHeadName, int nExit, int nType) const
       else if ( nType == TT_MILL_STD  ||  nType == TT_MILL_NOTIP  ||  nType == TT_MILL_POLISHING)
          sToolHolder = GetPrivateProfileStringUtf8( TOOLS_SEC.c_str(), MILLHOLDER_KEY.c_str(), "", sMachIni.c_str()) ;
    }
+  // Verifico se sovrascritto da nota dell'utensile
+   string sNotes, sVal ;
+   if ( TdbGetCurrToolParam( TPA_USERNOTES, sNotes)  &&
+        GetValInNotes( sNotes, "TH", sVal)  &&
+        ExistsFile( sToolHolderDir + "\\" + sVal))
+      sToolHolder = sVal ;
   // Se non trovato ancora, esco
    if ( sToolHolder.empty())
       return "" ;
-  // Recupero il direttorio dei portautensili
-   string sToolHolderDir ;
-   if ( ! TdbGetToolHolderDir( sToolHolderDir))
-      return "" ;
   // Restituisco la path
    return ( sToolHolderDir + "\\" + sToolHolder) ;
 }