From e21ab62e8fbb2adc387ebefada27a19d6ef44318 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 17 Aug 2018 07:40:55 +0000
Subject: [PATCH] Include : - razionalizzazione della interfaccia di
 simulazione.

---
 EInAPI.h      | 7 ++++---
 EMkMachMgr.h  | 3 ++-
 EXeExecutor.h | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/EInAPI.h b/EInAPI.h
index 2c320e4..276d3f6 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -732,16 +732,17 @@ EIN_EXPORT BOOL __stdcall EgtIsMachiningEmpty( void) ;
 EIN_EXPORT BOOL __stdcall EgtApplyAllMachinings( BOOL bRecalc, BOOL bStopOnFirstErr, wchar_t*& wsErrList) ;
 EIN_EXPORT BOOL __stdcall EgtUpdateAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList) ;
 // Simulation
+EIN_EXPORT BOOL __stdcall EgtSimInit( void) ;
 EIN_EXPORT BOOL __stdcall EgtSimStart( BOOL bFirst) ;
 EIN_EXPORT BOOL __stdcall EgtSimMove( int* pnStatus) ;
 EIN_EXPORT BOOL __stdcall EgtSimHome( void) ;
+EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ;
+EIN_EXPORT BOOL __stdcall EgtSimSetUiStatus( int nUiStatus) ;
 EIN_EXPORT BOOL __stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsName, wchar_t*& wsToken, BOOL* pbLinear, double* pdVal) ;
 EIN_EXPORT BOOL __stdcall EgtSimGetToolInfo( wchar_t*& wsTool, double* pdSpeed) ;
 EIN_EXPORT BOOL __stdcall EgtSimGetOperationInfo( wchar_t*& wsName, int* pnType) ;
 EIN_EXPORT BOOL __stdcall EgtSimGetMoveInfo( int* pnGmove, double* pdFeed) ;
-EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ;
-EIN_EXPORT BOOL __stdcall EgtSimSetUiStatus( int nUiStatus) ;
-EIN_EXPORT BOOL __stdcall EgtSimStop( void) ;
+EIN_EXPORT BOOL __stdcall EgtSimExit( void) ;
 // Generation & T&L estimation
 EIN_EXPORT BOOL __stdcall EgtGenerate( const wchar_t* wsCncFile, const wchar_t* wsInfo) ;
 EIN_EXPORT BOOL __stdcall EgtEstimate( const wchar_t* wsEstFile, const wchar_t* wsInfo) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index e163c2e..fd79ee6 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -225,6 +225,7 @@ class __declspec( novtable) IMachMgr
       virtual bool GetMachiningStartPoint( Point3d& ptStart) const = 0 ;
       virtual bool GetMachiningEndPoint( Point3d& ptEnd) const = 0 ;
      // Simulation
+      virtual bool SimInit( void) = 0 ;
       virtual bool SimStart( bool bFirst) = 0 ;
       virtual bool SimMove( int& nStatus) = 0 ;
       virtual bool SimGetAxisInfoPos( int nI, std::string& sName, std::string& sToken, bool& bLinear, double& dVal) const = 0 ;
@@ -234,7 +235,7 @@ class __declspec( novtable) IMachMgr
       virtual bool SimSetStep( double dStep) = 0 ;
       virtual bool SimSetUiStatus( int nUiStatus) = 0 ;
       virtual bool SimGoHome( void) = 0 ;
-      virtual bool SimStop( void) = 0 ;
+      virtual bool SimExit( void) = 0 ;
      // Generation
       virtual bool Generate( const std::string& sCncFile, const std::string& sInfo) = 0 ;
       virtual bool Estimate( const std::string& sEstFile, const std::string& sInfo) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 380b497..78bd620 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -821,16 +821,17 @@ EXE_EXPORT bool ExeGetMachiningEndPoint( Point3d& ptEnd) ;
 EXE_EXPORT bool ExeApplyAllMachinings( bool bRecalc, bool bStopOnFirstErr, std::string& sErrList) ;
 EXE_EXPORT bool ExeUpdateAllMachinings( bool bStopOnFirstErr, std::string& sErrList) ;
 // Simulation
+EXE_EXPORT bool ExeSimInit( void) ;
 EXE_EXPORT bool ExeSimStart( bool bFirst) ;
 EXE_EXPORT bool ExeSimMove( int& nStatus) ;
 EXE_EXPORT bool ExeSimHome( void) ;
+EXE_EXPORT bool ExeSimSetStep( double dStep) ;
+EXE_EXPORT bool ExeSimSetUiStatus( int nUiStatus) ;
 EXE_EXPORT bool ExeSimGetAxisInfoPos( int nI, std::string& sName, std::string& sToken, bool& bLinear, double& dVal) ;
 EXE_EXPORT bool ExeSimGetToolInfo( std::string& sName, double& dSpeed) ;
 EXE_EXPORT bool ExeSimGetOperationInfo( std::string& sName, int& nType) ;
 EXE_EXPORT bool ExeSimGetMoveInfo( int& nGmove, double& dFeed) ;
-EXE_EXPORT bool ExeSimSetStep( double dStep) ;
-EXE_EXPORT bool ExeSimSetUiStatus( int nUiStatus) ;
-EXE_EXPORT bool ExeSimStop( void) ;
+EXE_EXPORT bool ExeSimExit( void) ;
 // Generation & T&L estimation
 EXE_EXPORT bool ExeGenerate( const std::string& sCncFile, const std::string& sInfo) ;
 EXE_EXPORT bool ExeEstimate( const std::string& sEstFile, const std::string& sInfo) ;