diff --git a/EInAPI.h b/EInAPI.h index c4f8dcf..8e09390 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -599,6 +599,12 @@ 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 EgtGetLastOperation( void) ; +EIN_EXPORT int __stdcall EgtGetPrevOperation( int nId) ; +EIN_EXPORT int __stdcall EgtGetFirstActiveOperation( void) ; +EIN_EXPORT int __stdcall EgtGetNextActiveOperation( int nId) ; +EIN_EXPORT int __stdcall EgtGetLastActiveOperation( void) ; +EIN_EXPORT int __stdcall EgtGetPrevActiveOperation( int nId) ; EIN_EXPORT int __stdcall EgtGetOperationType( int nId) ; EIN_EXPORT int __stdcall EgtGetOperationPhase( int nId) ; EIN_EXPORT BOOL __stdcall EgtGetOperationName( int nId, wchar_t*& wsName) ; @@ -613,6 +619,7 @@ EIN_EXPORT BOOL __stdcall EgtSetOperationStatus( int nId, BOOL bShow) ; EIN_EXPORT BOOL __stdcall EgtGetOperationStatus( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetAllOperationsStatus( BOOL bShow) ; EIN_EXPORT BOOL __stdcall EgtChangeOperationPhase( int nId, int nNewPhase) ; +EIN_EXPORT BOOL __stdcall EgtRemoveOperationHome( int nId) ; // Dispositions EIN_EXPORT int __stdcall EgtGetPhaseDisposition( int nPhase) ; EIN_EXPORT BOOL __stdcall EgtSpecialApplyDisposition( int nId, BOOL bRecalc) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index b1f32e0..bc86498 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -161,7 +161,8 @@ class __declspec( novtable) IMachMgr 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 ; - virtual bool ChangeOperationPhase( int nId, int nNewPhase) = 0 ; + virtual bool ChangeOperationPhase( int nMchId, int nNewPhase) = 0 ; + virtual bool RemoveOperationHome( int nId) = 0 ; // Operations : dispositions virtual int GetPhaseDisposition( int nPhase) const = 0 ; virtual bool DispositionSpecialApply( int nId, bool bRecalc) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 871fe94..6bf5db0 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -339,10 +339,12 @@ EXE_EXPORT bool ExeSetName( int nId, const std::string& sName) ; EXE_EXPORT bool ExeGetName( int nId, std::string& sName) ; EXE_EXPORT bool ExeExistsName( int nId) ; EXE_EXPORT bool ExeRemoveName( int nId) ; +EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, bool bInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, int nInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, double dInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const std::string& sInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const Frame3d& frFrame) ; +EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, bool& bInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, int& nInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, double& dInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, std::string& sInfo) ; @@ -643,6 +645,12 @@ EXE_EXPORT bool ExeMdbGetMachiningDir( std::string& sMchDir) ; // Operations EXE_EXPORT int ExeGetFirstOperation( void) ; EXE_EXPORT int ExeGetNextOperation( int nId) ; +EXE_EXPORT int ExeGetLastOperation( void) ; +EXE_EXPORT int ExeGetPrevOperation( int nId) ; +EXE_EXPORT int ExeGetFirstActiveOperation( void) ; +EXE_EXPORT int ExeGetNextActiveOperation( int nId) ; +EXE_EXPORT int ExeGetLastActiveOperation( void) ; +EXE_EXPORT int ExeGetPrevActiveOperation( int nId) ; EXE_EXPORT int ExeGetOperationType( int nId) ; EXE_EXPORT int ExeGetOperationPhase( int nId) ; EXE_EXPORT bool ExeGetOperationName( int nId, std::string& sName) ; @@ -657,7 +665,8 @@ 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) ; -EXE_EXPORT bool ExeChangeOperationPhase( int nId, int nNewPhase) ; +EXE_EXPORT bool ExeChangeOperationPhase( int nMchId, int nNewPhase) ; +EXE_EXPORT bool ExeRemoveOperationHome( int nId) ; // Dispositions EXE_EXPORT int ExeGetPhaseDisposition( int nPhase) ; EXE_EXPORT bool ExeSpecialApplyDisposition( int nId, bool bRecalc) ;