From a053c1e579750df707e8da36f5bdcee98dc724d7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 13 Nov 2017 09:13:14 +0000 Subject: [PATCH] EgtMachKernel : - GetCalcToolDirFromAngles e GetCalcAuxDirFromAngles ora usano vettore di angoli. --- MachMgr.h | 4 ++-- MachMgrMachines.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MachMgr.h b/MachMgr.h index 3f9d2ba..1d5c64a 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -290,8 +290,8 @@ class MachMgr : public IMachMgr bool bOverall, bool bBottom, Point3d& ptTip) const override ; bool GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bOverall, bool bBottom, Point3d& ptTip) const ; - bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const override ; - bool GetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const override ; + bool GetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const override ; + bool GetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const override ; bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const override ; bool LimitAngleToStroke( int nInd, double& dAng) const override ; bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) const override ; diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index d08dffc..a88a5eb 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -578,23 +578,21 @@ MachMgr::GetCalcTipFromPositions( double dX, double dY, double dZ, const DBLVECT //---------------------------------------------------------------------------- bool -MachMgr::GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const +MachMgr::GetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const { Machine* pMch = GetCurrMachine() ; if ( pMch == nullptr) return false ; - DBLVECTOR vAng( 2) ; vAng[0] = dAngA ; vAng[1] = dAngB ; return pMch->GetToolDirFromAngles( vAng, vtDir) ; } //---------------------------------------------------------------------------- bool -MachMgr::GetCalcAuxDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const +MachMgr::GetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) const { Machine* pMch = GetCurrMachine() ; if ( pMch == nullptr) return false ; - DBLVECTOR vAng( 2) ; vAng[0] = dAngA ; vAng[1] = dAngB ; return pMch->GetAuxDirFromAngles( vAng, vtDir) ; }