From 08bf398839e88dce603e34907610a04fd8917d4b Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 2 Dec 2017 18:40:06 +0000
Subject: [PATCH] EgtMachKernel : - piccola modifica.

---
 Milling.cpp | 18 +++++++++++++++---
 Milling.h   |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Milling.cpp b/Milling.cpp
index 193b079..0961ac9 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -779,7 +779,7 @@ Milling::GetToolData( void) const
 
 //----------------------------------------------------------------------------
 bool
-Milling::UpdateToolData( void)
+Milling::UpdateToolData( bool* pbChanged)
 {
   // recupero il gestore DB utensili della macchina corrente
    ToolsMgr* pTMgr = m_pMchMgr->GetCurrToolsMgr() ;
@@ -789,13 +789,25 @@ Milling::UpdateToolData( void)
    const ToolData* pTdata = pTMgr->GetTool( m_Params.m_ToolUuid) ;
    if ( pTdata == nullptr)
       return false ;
-  // aggiorno i parametri
+  // verifico se sono diversi (ad esclusione del nome)
+   m_TParams.m_sName = pTdata->m_sName ;
+   bool bChanged = ! SameTool( m_TParams, *pTdata) ;
+  // aggiorno comunque i parametri
    m_TParams = *pTdata ;
+  // eventuali segnalazioni
    if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
       string sLog = "Warning in Milling : tool name changed (" +
-                    m_Params.m_sToolName + "->" + m_TParams.m_sName +")" ;
+                    m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
       LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
    }
+   if ( bChanged) {
+      string sLog = "Warning in Milling : tool data changed (" +
+                    m_Params.m_sToolName + ")" ;
+      LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
+   }
+  // se definito parametro di ritorno, lo assegno
+   if ( pbChanged != nullptr)
+      *pbChanged = bChanged ;
    return true ;
 }
 
diff --git a/Milling.h b/Milling.h
index a615f7b..10eefa9 100644
--- a/Milling.h
+++ b/Milling.h
@@ -64,7 +64,7 @@ class Milling : public Machining
       Milling( void) ;
 
    private :
-      bool UpdateToolData( void) ;
+      bool UpdateToolData( bool* pbChanged = nullptr) ;
       bool VerifyGeometry( SelData Id, int& nSubs, int& nType) ;
       ICurve* GetCurve( SelData Id) ;
       bool AdjustCurveFromSurf( ICurveComposite* pCrvCompo) ;