diff --git a/EMkMachMgr.h b/EMkMachMgr.h index c406b63..8275cc0 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -340,6 +340,7 @@ class __declspec( novtable) IMachMgr 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) const = 0 ; + virtual bool VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bClear, int& nStat) const = 0 ; virtual std::string GetOutstrokeInfo( bool bMM = true) const = 0 ; // Machine virtual int GetBaseId( const std::string& sBase) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5464f5b..58edd70 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1364,6 +1364,7 @@ EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, con EXE_EXPORT bool ExeGetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) ; EXE_EXPORT bool ExeGetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) ; EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; +EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat) ; EXE_EXPORT bool ExeGetOutstrokeInfo( std::string& sInfo) ; // Machine Move EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal, double* pdNewVal = nullptr) ;