From ce625eb3f2ad5ebf6475dad2956bc39b55db9161 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 29 Sep 2016 14:58:41 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EMkMachMgr.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index a887f83..304e554 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -203,15 +203,16 @@ class __declspec( novtable) IMachMgr virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; virtual bool SetRotAxisBlock( const std::string& sAxis, double dVal) = 0 ; - virtual bool GetCalcTool( std::string& sTool) = 0 ; + virtual bool GetCalcTool( std::string& sTool) const = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, - int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) = 0 ; + int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) const = 0 ; virtual bool GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, - int& nStat, double& dX, double& dY, double& dZ) = 0 ; + int& nStat, double& dX, double& dY, double& dZ) const = 0 ; virtual bool GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, - bool bOverall, bool bBottom, Point3d& ptTip) = 0 ; - virtual bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) = 0 ; - virtual bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) = 0 ; + bool bOverall, bool bBottom, Point3d& ptTip) const = 0 ; + virtual bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const = 0 ; + virtual bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const = 0 ; + virtual bool LimitAngleToStroke( int nInd, double& dAng) const = 0 ; virtual bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; virtual const std::string& GetOutstrokeInfo( void) const = 0 ; // Machine @@ -225,7 +226,7 @@ class __declspec( novtable) IMachMgr virtual bool ResetAxisPos( const std::string& sAxis) = 0 ; virtual bool ResetAllAxesPos( void) = 0 ; virtual bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) = 0 ; - virtual bool GetLoadedTool( const std::string& sHead, int nExit, std::string& sTool) = 0 ; + virtual bool GetLoadedTool( const std::string& sHead, int nExit, std::string& sTool) const = 0 ; virtual bool UnloadTool( const std::string& sHead, int nExit) = 0 ; virtual bool ResetHeadSet( const std::string& sHead) = 0 ; virtual bool SetMachineLook( int nFlag) = 0 ;