diff --git a/EInAPI.h b/EInAPI.h index 8c5cf14..929b862 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -561,6 +561,7 @@ 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 int __stdcall EgtGetRawPartFromPart( int nPartId) ; EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; // Table & Fixtures EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index f903211..9237f43 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -79,6 +79,7 @@ class __declspec( novtable) IMachMgr virtual int GetFirstPartInRawPart( int nRawId) const = 0 ; virtual int GetNextPartInRawPart( int nId) const = 0 ; virtual bool AddPartToRawPart( int nPartId, const Point3d& ptPos, int nRawId) = 0 ; + virtual int GetRawPartFromPart( int nPartId) = 0 ; virtual bool RemovePartFromRawPart( int nPartId) = 0 ; virtual bool TranslatePartInRawPart( int nPartId, const Vector3d& vtMove) = 0 ; virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; @@ -87,10 +88,14 @@ class __declspec( novtable) IMachMgr virtual bool GetTable( std::string& sTable) = 0 ; virtual bool GetTableRef( int nInd, Point3d& ptPos) = 0 ; virtual bool GetTableArea( int nInd, BBox3d& b3Area) = 0 ; + virtual bool ShowOnlyTable( bool bVal) = 0 ; virtual int AddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) = 0 ; + virtual bool RemoveFixture( int nFxtId) = 0 ; virtual int GetFirstFixture( void) = 0 ; virtual int GetNextFixture( int nFxtId) = 0 ; - virtual bool ShowOnlyTable( bool bVal) = 0 ; + virtual bool MoveFixture( int nId, const Vector3d& vtMove) = 0 ; + virtual bool RotateFixture( int nId, double dDeltaAngDeg) = 0 ; + virtual bool MoveFixtureMobile( int nId, double dDeltaMov) = 0 ; // Tools DataBase virtual bool TdbGetToolNewName( std::string& sName) const = 0 ; virtual bool TdbAddTool( const std::string& sName, int nType) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index e7b1924..42c5331 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -596,6 +596,7 @@ EXE_EXPORT int ExeGetPartInRawPartCount( int nRawId) ; EXE_EXPORT int ExeGetFirstPartInRawPart( int nRawId) ; EXE_EXPORT int ExeGetNextPartInRawPart( int nPartId) ; EXE_EXPORT bool ExeAddPartToRawPart( int nPartId, const Point3d& ptPos, int nRawId) ; +EXE_EXPORT int ExeGetRawPartFromPart( int nPartId) ; EXE_EXPORT bool ExeRemovePartFromRawPart( int nPartId) ; EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) ; EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; @@ -606,8 +607,12 @@ EXE_EXPORT bool ExeGetTableRef( int nInd, Point3d& ptPos) ; EXE_EXPORT bool ExeGetTableArea( int nInd, BBox3d& b3Area) ; EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; EXE_EXPORT int ExeAddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) ; +EXE_EXPORT bool ExeRemoveFixture( int nFxtId) ; EXE_EXPORT int ExeGetFirstFixture( void) ; EXE_EXPORT int ExeGetNextFixture( int nFxtId) ; +EXE_EXPORT bool ExeMoveFixture( int nFxtId, const Vector3d& vtMove) ; +EXE_EXPORT bool ExeRotateFixture( int nFxtId, double dDeltaAngDeg) ; +EXE_EXPORT bool ExeMoveFixtureMobile( int nFxtId, double dDeltaMove) ; // Tools Database EXE_EXPORT bool ExeTdbGetToolNewName( std::string& sName) ; EXE_EXPORT bool ExeTdbAddTool( const std::string& sName, int nType) ;