diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 275fdf3..b8a73ae 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2020 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 17.08.20 Versione : 2.2h2 +// File : EMkMachMgr.h Data : 10.11.20 Versione : 2.2k3 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -10,6 +10,7 @@ // 16.05.19 DS Aggiunto parametro sToolMakersDir a Init. // 26.06.19 DS Aggiunta gestione Warnings. // 17.08.20 DS Aggiunte GetAxisMin e GetAxisMax. +// 10.11.20 DS Portate in interfaccia funzioni di calcolo con vettori di angoli. // //---------------------------------------------------------------------------- @@ -273,10 +274,16 @@ class __declspec( novtable) IMachMgr 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) const = 0 ; + virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, + int& nStat, DBLVECTOR& vAng1, DBLVECTOR& vAng2) const = 0 ; virtual bool GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, int& nStat, double& dX, double& dY, double& dZ) const = 0 ; + virtual bool GetCalcPositions( const Point3d& ptP, const DBLVECTOR& vAng, + 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) const = 0 ; + virtual bool GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECTOR& vAng, + bool bOverall, bool bBottom, Point3d& ptTip) const = 0 ; virtual bool GetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const = 0 ; virtual bool GetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const = 0 ; virtual bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index e0c0e55..25f36df 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1020,10 +1020,16 @@ EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal EXE_EXPORT bool ExeGetCalcTool( std::string& sTool) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ; +EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, + int& nStat, DBLVECTOR& vAng1, DBLVECTOR& vAng2) ; EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, int& nStat, double& dX, double& dY, double& dZ) ; +EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, const DBLVECTOR& vAng, + int& nStat, double& dX, double& dY, double& dZ) ; EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bBottom, Point3d& ptTip) ; +EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECTOR& vAng, + bool bBottom, Point3d& ptTip) ; 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) ;