From b8d3c218b926aeb3f77f2c1ab7da6c704d9cefa4 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 17 Dec 2015 10:46:50 +0000 Subject: [PATCH] Include : - aggiornamenti vari. --- EInAPI.h | 9 ++++++++- EMkMachMgr.h | 8 ++++++++ EXeExecutor.h | 4 ++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/EInAPI.h b/EInAPI.h index 6004cc0..cbcfd5b 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -475,7 +475,7 @@ EIN_EXPORT int __stdcall EgtGetMachGroupId( const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtSetCurrMachGroup( int nMGroupId) ; EIN_EXPORT BOOL __stdcall EgtResetCurrMachGroup( void) ; EIN_EXPORT int __stdcall EgtGetCurrMachGroup( void) ; -// RawParts +// RawParts & Parts EIN_EXPORT int __stdcall EgtGetRawPartCount( void) ; EIN_EXPORT int __stdcall EgtGetFirstRawPart( void) ; EIN_EXPORT int __stdcall EgtGetNextRawPart( int nRawId) ; @@ -488,6 +488,9 @@ EIN_EXPORT BOOL __stdcall EgtModifyRawPartHeight( int nRawId, double dHeight) ; EIN_EXPORT BOOL __stdcall EgtRemoveRawPart( int nRawId) ; EIN_EXPORT BOOL __stdcall EgtMoveToCornerRawPart( int nRawId, const double ptCorner[3], int nFlag) ; EIN_EXPORT BOOL __stdcall EgtMoveRawPart( int nRawId, const double vtMove[3]) ; +EIN_EXPORT int __stdcall EgtGetPartInRawPartCount( int nRawId) ; +EIN_EXPORT int __stdcall EgtGetFirstPartInRawPart( int nRawId) ; +EIN_EXPORT int __stdcall EgtGetNextPartInRawPart( int nPartId) ; EIN_EXPORT BOOL __stdcall EgtAddPartToRawPart( int nPartId, const double ptPos[3], int nRawId) ; EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; // Table & Fixtures @@ -541,6 +544,10 @@ EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningDir( wchar_t*& wsMchDir) ; // Operations 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 EgtSetAllOperationsMode( BOOL bActive) ; +EIN_EXPORT BOOL __stdcall EgtSetOperationStatus( int nId, BOOL bShow) ; +EIN_EXPORT BOOL __stdcall EgtSetAllOperationsStatus( BOOL bShow) ; // Simulation EIN_EXPORT BOOL __stdcall EgtSimStart( void) ; EIN_EXPORT BOOL __stdcall EgtSimMove( int* pnStatus) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 6aa82b4..0de3c3e 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -126,11 +126,19 @@ class __declspec( novtable) IMachMgr virtual int GetNextOperation( int nId) const = 0 ; virtual int GetLastOperation( void) const = 0 ; virtual int GetPrevOperation( int nId) const = 0 ; + virtual int GetFirstActiveOperation( void) const = 0 ; + virtual int GetNextActiveOperation( int nId) const = 0 ; + virtual int GetLastActiveOperation( void) const = 0 ; + virtual int GetPrevActiveOperation( int nId) const = 0 ; virtual int GetOperationType( int nId) const = 0 ; virtual std::string GetOperationName( int nId) const = 0 ; virtual int GetOperationId( const std::string& sName) const = 0 ; virtual bool RemoveOperation( int nId) = 0 ; virtual bool RemoveAllOperations( bool bExceptFirstDisp) = 0 ; + virtual bool SetOperationMode( int nId, bool bActive) = 0 ; + virtual bool SetAllOperationsMode( bool bExceptFirstDisp, bool bActive) = 0 ; + virtual bool SetOperationStatus( int nId, bool bShow) = 0 ; + virtual bool SetAllOperationsStatus( bool bExceptFirstDisp, bool bShow) = 0 ; // Operations : dispositions virtual int AddDisposition( const std::string& sName) = 0 ; // Operations : machinings diff --git a/EXeExecutor.h b/EXeExecutor.h index 97b60fb..3dad1b4 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -559,6 +559,10 @@ EXE_EXPORT int ExeGetNextOperation( int nId) ; 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 ExeSetAllOperationsMode( bool bActive) ; +EXE_EXPORT bool ExeSetOperationStatus( int nId, bool bShow) ; +EXE_EXPORT bool ExeSetAllOperationsStatus( bool bShow) ; // Machinings EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ; EXE_EXPORT bool ExeSetCurrMachining( int nId) ;