Merge branch 'master' of https://gitlab.steamware.net/egaltech/Include
This commit is contained in:
@@ -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 ;
|
||||
|
||||
@@ -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) ;
|
||||
|
||||
Reference in New Issue
Block a user