From d640e85550c6107ede7e5c6f698c3b59020729a5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 21 Apr 2017 09:44:18 +0000
Subject: [PATCH] EgtMachKernel 1.8d7 : - aggiunto parametro a SimStart per
 distinguere puro inizio da avvio simulazione.

---
 EgtMachKernel.rc      | Bin 11774 -> 11774 bytes
 MachMgr.h             |   2 +-
 MachMgrSimulation.cpp |   4 ++--
 Simulator.cpp         |   4 ++--
 Simulator.h           |   2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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

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

diff --git a/MachMgr.h b/MachMgr.h
index 4414281..e94d39d 100644
--- a/MachMgr.h
+++ b/MachMgr.h
@@ -251,7 +251,7 @@ class MachMgr : public IMachMgr
       bool GetMachiningGeometry( SELVECTOR& vIds) const override ;
       bool IsMachiningEmpty( void) const override ;
      // Simulation
-      bool SimStart( void) override ;
+      bool SimStart( bool bFirst) override ;
       bool SimMove( int& nStatus) override ;
       bool SimGetAxisInfoPos( int nI, std::string& sName, std::string& sToken, bool& bLinear, double& dVal) override ;
       bool SimGetToolInfo( std::string& sName, double& dSpeed) override ;
diff --git a/MachMgrSimulation.cpp b/MachMgrSimulation.cpp
index 9aaf9c7..16f76d6 100644
--- a/MachMgrSimulation.cpp
+++ b/MachMgrSimulation.cpp
@@ -22,7 +22,7 @@ using namespace std ;
 
 //----------------------------------------------------------------------------
 bool
-MachMgr::SimStart( void)
+MachMgr::SimStart( bool bFirst)
 {
   // alloco simulatore
    if ( m_pSimul != nullptr)
@@ -34,7 +34,7 @@ MachMgr::SimStart( void)
    if ( ! m_pSimul->Init( this))
       return false ;
   // lo avvio
-   return m_pSimul->Start() ;
+   return m_pSimul->Start( bFirst) ;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Simulator.cpp b/Simulator.cpp
index eacd233..af9de39 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -73,7 +73,7 @@ Simulator::Init( MachMgr* pMchMgr)
 
 //----------------------------------------------------------------------------
 bool
-Simulator::Start( void)
+Simulator::Start( bool bFirst)
 {
   // Verifico ci sia una macchinata corrente
    if ( m_pMchMgr == nullptr  ||  m_pMchMgr->GetCurrMachGroup() == GDB_ID_NULL)
@@ -101,7 +101,7 @@ Simulator::Start( void)
 
   // Arrivo alla preparazione per la prima lavorazione
    int nStatus ;
-   return FindAndManageOperationStart( true, nStatus) ;
+   return FindAndManageOperationStart( bFirst, nStatus) ;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Simulator.h b/Simulator.h
index 9eaaf24..6dad563 100644
--- a/Simulator.h
+++ b/Simulator.h
@@ -27,7 +27,7 @@ class Simulator
       Simulator( void) ;
       ~Simulator( void) ;
       bool Init( MachMgr* pMchMgr) ;
-      bool Start( void) ;
+      bool Start( bool bFirst) ;
       bool Move( int& nStatus) ;
       bool GetAxisInfoPos( int nI, std::string& sName, std::string& sToken, bool& bLinear, double& dVal) const ;
       bool GetToolInfo( std::string& sName, double& dSpeed) const ;