From 035386bd0e4fa0afd10cc2869ebca96df55d8bf4 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 20 Apr 2017 08:32:56 +0000
Subject: [PATCH] EgtMachKernel 1.8d6 : - all'avvio simulazione si carica
 l'utensile della prima lavorazione senza lanciare script OnSelectTool.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Simulator.cpp    |  14 +++++++-------
 Simulator.h      |   2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 9ed32b414edaffb567fe10d57b49248bf9542d0b..212df1e24a163609b33462160b20462cd0a177ba 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&QA&A-`fnHkL{Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUTDBd7oX

delta 97
zcmewt{V#gMFE&Qg&A-`fnHfzdKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUO4BcK2P

diff --git a/Simulator.cpp b/Simulator.cpp
index e1c5381..78b99ca 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -287,7 +287,7 @@ Simulator::Stop( void)
 
 //----------------------------------------------------------------------------
 bool
-Simulator::UpdateTool( bool bForced)
+Simulator::UpdateTool( bool bFirst)
 {
   // Recupero l'utensile della lavorazione corrente
    Machining* pMch = GetMachining( m_pGeomDB->GetUserObj( m_nOpId)) ;
@@ -313,10 +313,10 @@ Simulator::UpdateTool( bool bForced)
          if ( ! OnToolDeselect( sTool, sHead, nExit, sTcPos))
             return false ;
       }
-     // se cambiato oppure forzato, attivo l'utensile della lavorazione
-      if ( sTool != m_sTool  ||  bForced) {
-        // se forzato, pulisco la testa
-         if ( bForced) 
+     // se cambiato oppure prima volta, attivo l'utensile della lavorazione
+      if ( sTool != m_sTool  ||  bFirst) {
+        // se prima volta, pulisco la testa
+         if ( bFirst) 
             m_pMchMgr->ResetHeadSet( sHead) ;
         // carico l'utensile (e lo rendo corrente)
          if ( ! m_pMchMgr->SetCalcTool( sTool, sHead, nExit))
@@ -326,7 +326,7 @@ Simulator::UpdateTool( bool bForced)
          if ( ! UpdateAxes())
             return false ;
         // eventuale lancio script
-         if ( ! OnToolSelect( m_sTool, sHead, nExit, sTcPos))
+         if ( ! bFirst  &&  ! OnToolSelect( m_sTool, sHead, nExit, sTcPos))
             return false ;
       }
       return true ;
@@ -351,7 +351,7 @@ Simulator::UpdateTool( bool bForced)
       if ( ! UpdateAxes())
          return false ;
      // eventuale lancio script
-      if ( ! OnToolSelect( m_sTool, sHead, nExit, sTcPos))
+      if ( ! bFirst  &&  ! OnToolSelect( m_sTool, sHead, nExit, sTcPos))
          return false ;
       return true ;
    }
diff --git a/Simulator.h b/Simulator.h
index 0e59384..7e50c39 100644
--- a/Simulator.h
+++ b/Simulator.h
@@ -37,7 +37,7 @@ class Simulator
       bool Stop( void) ;
 
    private :
-      bool UpdateTool( bool bForced = false) ;
+      bool UpdateTool( bool bFirst = false) ;
       bool UpdateAxes( void) ;
       bool UpdateAxesPos( void) ;
       bool ResetAxes( void) ;