diff --git a/EInAPI.h b/EInAPI.h index cab95b1..1dc8858 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -604,9 +604,11 @@ EIN_EXPORT BOOL __stdcall EgtMovePartInRawPart( int nPartId, const double vtMove EIN_EXPORT BOOL __stdcall EgtRotatePartInRawPart( int nRawId, const double vtAx[3], double dAngDeg) ; // Table & Fixtures EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; +EIN_EXPORT BOOL __stdcall EgtSetTableAreaOffset( double dOffsXP, double dOffsYP, double dOffsXM, double dOffsYM) ; EIN_EXPORT BOOL __stdcall EgtGetTableName( wchar_t*& wsTableName) ; EIN_EXPORT BOOL __stdcall EgtGetTableRef( int nInd, double ptPos[3]) ; EIN_EXPORT BOOL __stdcall EgtGetTableArea( int nInd, double ptMin[3], double ptMax[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetTableAreaOffset( int nInd, double ptMinOffs[3], double ptMaxOffs[3]) ; EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; EIN_EXPORT int __stdcall EgtAddFixture( const wchar_t* wsName, const double ptPos[3], double dAngRotDeg, double dMov) ; EIN_EXPORT BOOL __stdcall EgtKeepFixture( int nFxtId, int nSouPhase) ; @@ -685,6 +687,7 @@ EIN_EXPORT int __stdcall EgtGetOperationType( int nId) ; EIN_EXPORT int __stdcall EgtGetOperationPhase( int nId) ; EIN_EXPORT BOOL __stdcall EgtGetOperationName( int nId, wchar_t*& wsName) ; EIN_EXPORT int __stdcall EgtGetOperationId( const wchar_t* wsName) ; +EIN_EXPORT BOOL __stdcall EgtIsOperationEmpty( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveOperation( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveAllPhaseOperations( int nPhase) ; EIN_EXPORT BOOL __stdcall EgtRemoveAllOperations( void) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 0ca8c3f..e163c2e 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -94,16 +94,18 @@ class __declspec( novtable) IMachMgr virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; // Tables and Fixtures virtual bool SetTable( const std::string& sTable) = 0 ; - 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 SetTableAreaOffset( double dOffsXP, double dOffsYP, double dOffsXM, double dOffsYM) = 0 ; + virtual bool GetTable( std::string& sTable) const = 0 ; + virtual bool GetTableRef( int nInd, Point3d& ptPos) const = 0 ; + virtual bool GetTableArea( int nInd, BBox3d& b3Area) const = 0 ; + virtual bool GetTableAreaOffset( int nInd, BBox3d& b3Area) const = 0 ; virtual bool ShowOnlyTable( bool bVal) = 0 ; virtual int AddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) = 0 ; virtual bool KeepFixture( int nFxtId, int nSouPhase) = 0 ; virtual bool RemoveFixture( int nFxtId) = 0 ; virtual bool VerifyFixture( int nFxtId) const = 0 ; - virtual int GetFirstFixture( void) = 0 ; - virtual int GetNextFixture( int nFxtId) = 0 ; + virtual int GetFirstFixture( void) const = 0 ; + virtual int GetNextFixture( int nFxtId) const = 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 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index a6a12f0..22f0e30 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -683,9 +683,11 @@ EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; // Table & Disposition EXE_EXPORT bool ExeSetTable( const std::string& sTable) ; +EXE_EXPORT bool ExeSetTableAreaOffset( double dOffsXP, double dOffsYP, double dOffsXM, double dOffsYM) ; EXE_EXPORT bool ExeGetTable( std::string& sTable) ; EXE_EXPORT bool ExeGetTableRef( int nInd, Point3d& ptPos) ; EXE_EXPORT bool ExeGetTableArea( int nInd, BBox3d& b3Area) ; +EXE_EXPORT bool ExeGetTableAreaOffset( int nInd, BBox3d& b3AreaOffs) ; EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; EXE_EXPORT int ExeAddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) ; EXE_EXPORT bool ExeKeepFixture( int nFxtId, int nSouPhase) ;