From cd6ae20689b0ad3da2379cb47175b0d2d3cc86fd Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 1 Nov 2016 19:08:09 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 2 +- EMkMachMgr.h | 2 +- EXeExecutor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index c33e273..6bef9c8 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -677,7 +677,7 @@ EIN_EXPORT BOOL __stdcall EgtIsMachiningEmpty( void) ; EIN_EXPORT BOOL __stdcall EgtSimStart( void) ; EIN_EXPORT BOOL __stdcall EgtSimMove( int* pnStatus) ; EIN_EXPORT BOOL __stdcall EgtSimHome( void) ; -EIN_EXPORT BOOL __stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsName, double* pdVal) ; +EIN_EXPORT BOOL __stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsToken, BOOL* pbLinear, double* pdVal) ; EIN_EXPORT BOOL __stdcall EgtSimGetToolInfo( wchar_t*& wsTool, double* pdSpeed) ; EIN_EXPORT BOOL __stdcall EgtSimGetMoveInfo( int* pnGmove, double* pdFeed) ; EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 3006455..923a4d2 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -201,7 +201,7 @@ class __declspec( novtable) IMachMgr // Simulation virtual bool SimStart( void) = 0 ; virtual bool SimMove( int& nStatus) = 0 ; - virtual bool SimGetAxisInfoPos( int nI, std::string& sToken, double& dVal) = 0 ; + virtual bool SimGetAxisInfoPos( int nI, std::string& sToken, bool& bLinear, double& dVal) = 0 ; virtual bool SimGetToolInfo( std::string& sName, double& dSpeed) = 0 ; virtual bool SimGetMoveInfo( int& nGmove, double& dFeed) = 0 ; virtual bool SimSetStep( double dStep) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index c792b94..246796f 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -726,7 +726,7 @@ EXE_EXPORT bool ExeIsMachiningEmpty( void) ; EXE_EXPORT bool ExeSimStart( void) ; EXE_EXPORT bool ExeSimMove( int& nStatus) ; EXE_EXPORT bool ExeSimHome( void) ; -EXE_EXPORT bool ExeSimGetAxisInfoPos( int nI, std::string& sName, double& dVal) ; +EXE_EXPORT bool ExeSimGetAxisInfoPos( int nI, std::string& sToken, bool& bLinear, double& dVal) ; EXE_EXPORT bool ExeSimGetToolInfo( std::string& sName, double& dSpeed) ; EXE_EXPORT bool ExeSimGetMoveInfo( int& nGmove, double& dFeed) ; EXE_EXPORT bool ExeSimSetStep( double dStep) ;