From 36416d0f01de3666d8fd1e9047f747d665059f84 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 31 May 2018 06:49:21 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EInAPI.h | 3 ++- EMkMachMgr.h | 1 + EXeExecutor.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index 458f630..cab95b1 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -737,8 +737,9 @@ 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) ; -// Generation +// 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) ; // Machine EIN_EXPORT int __stdcall EgtGetBaseId( const wchar_t* wsBase) ; EIN_EXPORT int __stdcall EgtGetTableId( const wchar_t* wsTable) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 109eace..0ca8c3f 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -235,6 +235,7 @@ class __declspec( novtable) IMachMgr virtual bool SimStop( 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 ; // Machine Calc virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index d504fce..a6a12f0 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -821,8 +821,9 @@ 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) ; -// Generation +// 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) ; // Machine EXE_EXPORT int ExeGetBaseId( const std::string& sBase) ; EXE_EXPORT int ExeGetTableId( const std::string& sTable) ;