From f674c50f8922c11becfdf87812f420423c49e314 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Fri, 10 Jun 2022 11:55:28 +0200
Subject: [PATCH] EgtMachKernel 2.4f3 : - migliorata gestione parametri
 porta-utensile in DB utensili.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 ToolsMgr.cpp     |  24 +++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 89cc9ee5b4e86f850ca28fbb20c53385647773ce..ba388c4804f91cc2b06fc0cb96dcc25fb081edad 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUD-Bai?9

delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

diff --git a/ToolsMgr.cpp b/ToolsMgr.cpp
index ae7e129..7cd8c6c 100644
--- a/ToolsMgr.cpp
+++ b/ToolsMgr.cpp
@@ -683,9 +683,11 @@ ToolsMgr::GetCurrToolMaxDepth( double dSafe, double& dMaxDepth) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
@@ -741,9 +743,11 @@ ToolsMgr::GetCurrToolThDiam( double& dThDiam) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
@@ -780,9 +784,11 @@ ToolsMgr::GetCurrToolThLength( double& dThLen) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;