From 8cab5d6e00df0cc582215c982da7e80aa7f6d006 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 11 Feb 2016 10:21:41 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EMkMachMgr.h | 7 +++++++ EMkMachiningGeoConst.h | 2 ++ EXeExecutor.h | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 08c3efc..6b05b71 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -49,6 +49,12 @@ class __declspec( novtable) IMachMgr virtual bool SetCurrMachGroup( int nId) = 0 ; virtual bool ResetCurrMachGroup( void) = 0 ; virtual int GetCurrMachGroup( void) const = 0 ; + // Phases + virtual int AddPhase( void) ; + virtual bool SetCurrPhase( int nPhase) ; + virtual int GetCurrPhase( void) const ; + virtual bool RemoveLastPhase( void) ; + virtual int GetPhaseCount( void) const ; // RawParts virtual int GetRawPartCount( void) const = 0 ; virtual int GetFirstRawPart( void) const = 0 ; @@ -58,6 +64,7 @@ class __declspec( novtable) IMachMgr virtual bool ModifyRawPart( int nRawId, const Point3d& ptOrig, double dLen, double dWidth, double dHeight, Color cCol) = 0 ; virtual bool ModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) = 0 ; virtual bool ModifyRawPartHeight( int nRawId, double dHeight) = 0 ; + virtual bool KeepRawPart( int nRawId) ; virtual bool RemoveRawPart( int nRawId) = 0 ; virtual bool RotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; virtual bool MoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) = 0 ; diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index b75cec2..5edb227 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -16,6 +16,8 @@ #include //---------------------------------------------------------------------------- +// Chiave per fase di appartenenza +static std::string KEY_PHASE = "PH" ; // Chiave per elenco identificativi di selezione static std::string KEY_IDS = "IDS" ; // Chiave per conteggio elementi geometrici di lavorazione diff --git a/EXeExecutor.h b/EXeExecutor.h index 95ec782..fc7091d 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -535,6 +535,11 @@ EXE_EXPORT int ExeGetMachGroupId( const std::string& sName) ; EXE_EXPORT bool ExeSetCurrMachGroup( int nMGroupId) ; EXE_EXPORT bool ExeResetCurrMachGroup( void) ; EXE_EXPORT int ExeGetCurrMachGroup( void) ; +// Phases +EXE_EXPORT int ExeAddPhase( void) ; +EXE_EXPORT bool ExeSetCurrPhase( int nPhase) ; +EXE_EXPORT int ExeGetCurrPhase( void) ; +EXE_EXPORT int ExeGetPhaseCount( void) ; // Raw Parts & Parts EXE_EXPORT int ExeGetRawPartCount( void) ; EXE_EXPORT int ExeGetFirstRawPart( void) ; @@ -544,6 +549,7 @@ EXE_EXPORT int ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, EXE_EXPORT bool ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ; EXE_EXPORT bool ExeModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ; EXE_EXPORT bool ExeModifyRawPartHeight( int nRawId, double dHeight) ; +EXE_EXPORT bool ExeKeepRawPart( int nRawId) ; EXE_EXPORT bool ExeRemoveRawPart( int nRawId) ; EXE_EXPORT bool ExeRotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) ; EXE_EXPORT bool ExeMoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) ;