diff --git a/EMkMachMgr.h b/EMkMachMgr.h index bb0963e..4f69595 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -307,13 +307,15 @@ class __declspec( novtable) IMachMgr // Machine Calc virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; - virtual bool GetAllCurrAxesNames( STRVECTOR& vAxName) const = 0 ; + virtual bool SetCalcSolCh( int nScc, bool bExact) = 0 ; virtual bool SetRotAxisBlock( const std::string& sAxis, double dVal) = 0 ; - virtual bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const = 0 ; virtual bool GetCalcTable( std::string& sTable) const = 0 ; virtual bool GetCalcTool( std::string& sTool) const = 0 ; virtual bool GetCalcHead( std::string& sHead) const = 0 ; virtual bool GetCalcExit( int& nExit) const = 0 ; + virtual bool GetCalcSolCh( int& nScc, bool& bExact) const = 0 ; + virtual bool GetAllCurrAxesNames( STRVECTOR& vAxName) const = 0 ; + virtual bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) const = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, diff --git a/EXeExecutor.h b/EXeExecutor.h index d29477d..69d0630 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1331,9 +1331,11 @@ EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ; // Machine Calc 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 ExeSetCalcSolCh( int nScc, bool bExact) ; EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetCalcTable( std::string& sTable) ; EXE_EXPORT bool ExeGetCalcTool( std::string& sTool, std::string& sHead, int& nExit) ; +EXE_EXPORT bool ExeGetCalcSolCh( int& nScc, bool& bExact) ; EXE_EXPORT bool ExeGetAllCurrAxesNames( STRVECTOR& vAxName) ; EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,