From d4fa3c868029441a0d878a047e130c4f555575ba Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 18 Jan 2016 08:04:31 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 7 +++++++ EMkMachMgr.h | 5 ++++- EXeExecutor.h | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index 6c87157..202cb02 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -560,11 +560,16 @@ EIN_EXPORT BOOL __stdcall EgtMdbGetSafeZ( double* pdSafeZ) ; EIN_EXPORT BOOL __stdcall EgtMdbSave( void) ; EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningDir( wchar_t*& wsMchDir) ; // Operations +EIN_EXPORT int __stdcall EgtGetFirstOperation( void) ; +EIN_EXPORT int __stdcall EgtGetNextOperation( int nId) ; +EIN_EXPORT int __stdcall EgtGetOperationType( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveOperation( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveAllOperations( void) ; EIN_EXPORT BOOL __stdcall EgtSetOperationMode( int nId, BOOL bActive) ; +EIN_EXPORT BOOL __stdcall EgtGetOperationMode( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetAllOperationsMode( BOOL bActive) ; EIN_EXPORT BOOL __stdcall EgtSetOperationStatus( int nId, BOOL bShow) ; +EIN_EXPORT BOOL __stdcall EgtGetOperationStatus( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetAllOperationsStatus( BOOL bShow) ; // Simulation EIN_EXPORT BOOL __stdcall EgtSimStart( void) ; @@ -582,6 +587,8 @@ EIN_EXPORT BOOL __stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* EIN_EXPORT BOOL __stdcall EgtGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, BOOL bBottom, double ptTip[3]) ; EIN_EXPORT BOOL __stdcall EgtGetCalcToolDirFromAngles( double dAngA, double dAngB, double vtDir[3]) ; +EIN_EXPORT BOOL __stdcall EgtVerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int* pnStat) ; +EIN_EXPORT BOOL __stdcall EgtGetOutstrokeInfo( wchar_t*& wsInfo) ; // Machine Move EIN_EXPORT BOOL __stdcall EgtSetAxisPos( const wchar_t* wsAxis, double dVal) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 6c4cafe..e520d89 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -136,8 +136,10 @@ class __declspec( novtable) IMachMgr virtual bool RemoveOperation( int nId) = 0 ; virtual bool RemoveAllOperations( bool bExceptFirstDisp) = 0 ; virtual bool SetOperationMode( int nId, bool bActive) = 0 ; + virtual bool GetOperationMode( int nId, bool& bActive) const = 0 ; virtual bool SetAllOperationsMode( bool bExceptFirstDisp, bool bActive) = 0 ; virtual bool SetOperationStatus( int nId, bool bShow) = 0 ; + virtual bool GetOperationStatus( int nId, bool& bShow) const = 0 ; virtual bool SetAllOperationsStatus( bool bExceptFirstDisp, bool bShow) = 0 ; // Operations : dispositions virtual int AddDisposition( const std::string& sName) = 0 ; @@ -180,7 +182,8 @@ class __declspec( novtable) IMachMgr bool bBottom, Point3d& ptTip) = 0 ; virtual bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) = 0 ; virtual bool GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) = 0 ; - virtual bool VerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; + virtual bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; + virtual const std::string& GetOutstrokeInfo( void) const = 0 ; // Machine Move virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; virtual bool GetAxisPos( const std::string& sAxis, double& dVal) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5f83d1c..bc7a670 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -601,8 +601,10 @@ EXE_EXPORT int ExeGetOperationType( int nId) ; EXE_EXPORT bool ExeRemoveOperation( int nId) ; EXE_EXPORT bool ExeRemoveAllOperations( void) ; EXE_EXPORT bool ExeSetOperationMode( int nId, bool bActive) ; +EXE_EXPORT bool ExeGetOperationMode( int nId, bool& bActive) ; EXE_EXPORT bool ExeSetAllOperationsMode( bool bActive) ; EXE_EXPORT bool ExeSetOperationStatus( int nId, bool bShow) ; +EXE_EXPORT bool ExeGetOperationStatus( int nId, bool& bShow) ; EXE_EXPORT bool ExeSetAllOperationsStatus( bool bShow) ; // Machinings EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ; @@ -641,7 +643,8 @@ EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dA EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bBottom, Point3d& ptTip) ; EXE_EXPORT bool ExeGetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) ; -EXE_EXPORT bool ExeVerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; +EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; +EXE_EXPORT bool ExeGetOutstrokeInfo( std::string& sInfo) ; // Machine Move EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ;