From a2146c8be7885491ba79e7218e95d4b37608210d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 12 May 2015 21:57:37 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EMkMachMgr.h | 8 ++++++++ EXeExecutor.h | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index fb0b9aa..954fd6c 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -72,6 +72,14 @@ class __declspec( novtable) IMachMgr virtual bool ResetAxisPos( const std::string& sAxis) = 0 ; virtual bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) = 0 ; virtual bool ResetHeadSet( const std::string& sHead) = 0 ; + virtual bool SetCalcTable( const std::string& sTable) = 0 ; + virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; + virtual bool GetCalcAngles( const Vector3d& vtDirT, + int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) = 0 ; + virtual bool GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, + int& nStat, double& dX, double& dY, double& dZ) = 0 ; + virtual bool VerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; + } ; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 5aa5cde..bfa1775 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -419,6 +419,13 @@ EXE_EXPORT bool ExeGetAxisHomePos( const std::string& sAxis, double* pdHomeVal) EXE_EXPORT bool ExeResetAxisPos( const std::string& sAxis) ; EXE_EXPORT bool ExeLoadTool( const std::string& sHead, int nExit, const std::string& sTool) ; EXE_EXPORT bool ExeResetHeadSet( const std::string& sHead) ; +EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ; +EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ; +EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, + int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ; +EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, + int& nStat, double& dX, double& dY, double& dZ) ; +EXE_EXPORT bool ExeVerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; // Scene EXE_EXPORT bool ExeInitScene( HWND hWnd, int nDriver, bool b2Buff, int nColorBits, int nDepthBits) ;