From 97995c5471a6545510382d2c4a64d4890e68236e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 13 Nov 2017 09:16:34 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 4 ++-- EXeExecutor.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 126a8fd..1e961de 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -246,8 +246,8 @@ class __declspec( novtable) IMachMgr 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 GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const = 0 ; - virtual bool GetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) 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 ; 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 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 35eb8f3..7a8f3d9 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -825,8 +825,8 @@ EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dA 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 ExeGetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) ; -EXE_EXPORT bool ExeGetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) ; +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 ExeGetOutstrokeInfo( std::string& sInfo) ; // Machine Move