From 40a53a381b42a3aae3b0e47031b1ae4053081a6a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 22 Dec 2016 18:08:46 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 2 ++ EXeExecutor.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index b949dd8..e8cbf96 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -37,6 +37,7 @@ class __declspec( novtable) IMachMgr // Machines virtual bool SetCurrMachine( const std::string& sMachineName) = 0 ; virtual bool GetCurrMachineName( std::string& sMachineName) const = 0 ; + virtual bool GetCurrMachineDir( std::string& sMachineDir) const = 0 ; // MachGroups virtual int GetMachGroupCount( void) const = 0 ; virtual int GetFirstMachGroup( void) const = 0 ; @@ -73,6 +74,7 @@ class __declspec( novtable) IMachMgr virtual bool MoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) = 0 ; virtual bool MoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) = 0 ; virtual bool MoveRawPart( int nRawId, const Vector3d& vtMove) = 0 ; + virtual bool GetRawPartCenter( int nRawId, Point3d& ptCen) = 0 ; virtual int SplitFlatRawPartWithMachinings( int nRawId, const INTVECTOR& vMchId) = 0 ; // Parts virtual int GetPartInRawPartCount( int nRawId) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 838cfae..5040817 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -571,6 +571,7 @@ EXE_EXPORT bool ExeInsertMachMgr( int nInsGrp) ; // Machines EXE_EXPORT bool ExeSetCurrMachine( const std::string& sMachineName) ; EXE_EXPORT bool ExeGetCurrMachineName( std::string& sMachineName) ; +EXE_EXPORT bool ExeGetCurrMachineDir( std::string& sMachineDir) ; // Machining Groups EXE_EXPORT int ExeGetMachGroupCount( void) ; EXE_EXPORT int ExeGetFirstMachGroup( void) ; @@ -608,6 +609,7 @@ EXE_EXPORT bool ExeRotateRawPart( int nRawId, const Vector3d& vtAx, double dAngR EXE_EXPORT bool ExeMoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) ; EXE_EXPORT bool ExeMoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) ; EXE_EXPORT bool ExeMoveRawPart( int nRawId, const Vector3d& vtMove) ; +EXE_EXPORT bool ExeGetRawPartCenter( int nRawId, Point3d& ptCen) ; EXE_EXPORT int ExeSplitFlatRawPartWithMachinings( int nRawId, const INTVECTOR& vMchId) ; EXE_EXPORT int ExeGetPartInRawPartCount( int nRawId) ; EXE_EXPORT int ExeGetFirstPartInRawPart( int nRawId) ;