diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 142fcdf..cb7e103 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -104,19 +104,30 @@ class __declspec( novtable) IMachMgr virtual bool TdbGetToolParam( const std::string& sName, int nType, double& dVal) const = 0 ; virtual bool TdbGetToolParam( const std::string& sName, int nType, std::string& sVal) const = 0 ; virtual bool TdbSave( void) const = 0 ; - // Operations - virtual int AddMachining( const std::string& sName, const std::string& sMachining) = 0 ; - virtual bool SetMachiningParam( int nType, bool bVal) = 0 ; - virtual bool SetMachiningParam( int nType, int nVal) = 0 ; - virtual bool SetMachiningParam( int nType, double dVal) = 0 ; - virtual bool SetMachiningParam( int nType, const std::string& sVal) = 0 ; - virtual bool SetMachiningGeometry( const SELVECTOR& vIds) = 0 ; - virtual bool Apply( void) = 0 ; + // Operations : general + virtual int GetOperationCount( void) const = 0 ; virtual int GetFirstOperation( void) const = 0 ; virtual int GetNextOperation( int nId) const = 0 ; virtual int GetLastOperation( void) const = 0 ; virtual int GetPrevOperation( 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 ; + // Operations : dispositions + virtual int AddDisposition( const std::string& sName) = 0 ; + // Operations : machinings + virtual int AddMachining( const std::string& sName, const std::string& sMachining) = 0 ; + virtual bool SetCurrMachining( int nId) = 0 ; + virtual bool ResetCurrMachining( void) = 0 ; + virtual int GetCurrMachining( void) const = 0 ; + virtual bool SetMachiningParam( int nType, bool bVal) = 0 ; + virtual bool SetMachiningParam( int nType, int nVal) = 0 ; + virtual bool SetMachiningParam( int nType, double dVal) = 0 ; + virtual bool SetMachiningParam( int nType, const std::string& sVal) = 0 ; + virtual bool SetMachiningGeometry( const SELVECTOR& vIds) = 0 ; + virtual bool MachiningApply( void) = 0 ; // Simulation virtual bool SimStart( void) = 0 ; virtual bool SimMove( void) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 85716b6..7bc0574 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -530,6 +530,11 @@ EXE_EXPORT bool ExeTdbGetToolParam( const std::string& sName, int nType, int& nV EXE_EXPORT bool ExeTdbGetToolParam( const std::string& sName, int nType, double& dVal) ; EXE_EXPORT bool ExeTdbGetToolParam( const std::string& sName, int nType, std::string& sVal) ; EXE_EXPORT bool ExeTdbSave( void) ; +// Operations +EXE_EXPORT int ExeGetFirstOperation( void) ; +EXE_EXPORT int ExeGetNextOperation( int nId) ; +EXE_EXPORT int ExeGetOperationType( int nId) ; +EXE_EXPORT bool ExeRemoveAllOperations( void) ; // Machinings EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ; EXE_EXPORT bool ExeSetMachiningParam( int nType, bool bVal) ; @@ -538,9 +543,6 @@ EXE_EXPORT bool ExeSetMachiningParam( int nType, double dVal) ; EXE_EXPORT bool ExeSetMachiningParam( int nType, const std::string& sVal) ; EXE_EXPORT bool ExeSetMachiningGeometry( const SELVECTOR& vIds) ; EXE_EXPORT bool ExeApplyMachining( void) ; -EXE_EXPORT int ExeGetFirstOperation( void) ; -EXE_EXPORT int ExeGetNextOperation( int nId) ; -EXE_EXPORT int ExeGetOperationType( int nId) ; // Simulation EXE_EXPORT bool ExeSimStart( void) ; EXE_EXPORT bool ExeSimMove( void) ;