From 44092243cfa3353bca1c0e26eb251895f7769ff4 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 6 Jul 2016 16:05:38 +0000 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=20:=20-=20corretto=20calcolo=20an?= =?UTF-8?q?goli=20pi=C3=B9=20vicini=20a=20quelli=20di=20lavorazione=20prec?= =?UTF-8?q?edente.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MachMgr.h | 2 +- MachMgrMachines.cpp | 4 ++-- Machine.h | 2 +- MachineCalc.cpp | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MachMgr.h b/MachMgr.h index 9ccd806..ff6b5f6 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -246,7 +246,7 @@ class MachMgr : public IMachMgr bool GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bOverall, bool bBottom, Point3d& ptTip) override ; bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) override ; - bool GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) override ; + bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) override ; bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) override ; bool VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat) ; const std::string& GetOutstrokeInfo( void) const override ; diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index 676d4b5..e672f68 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -416,10 +416,10 @@ MachMgr::GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) //---------------------------------------------------------------------------- bool -MachMgr::GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) +MachMgr::GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) { Machine* pMch = GetCurrMachine() ; - return ( ( pMch != nullptr) ? pMch->GetNearestAngleInStroke( nId, dAngRef, dAng) : false) ; + return ( ( pMch != nullptr) ? pMch->GetNearestAngleInStroke( nInd, dAngRef, dAng) : false) ; } //---------------------------------------------------------------------------- diff --git a/Machine.h b/Machine.h index 41684aa..e5c5388 100644 --- a/Machine.h +++ b/Machine.h @@ -95,7 +95,7 @@ class Machine bool GetTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bBottom, bool bOverall, Point3d& ptTip) const ; bool GetToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) const ; - bool GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) const ; + bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const ; bool VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat) const ; const std::string& GetOutstrokeInfo( void) const { return m_sOutstrokeInfo ; } diff --git a/MachineCalc.cpp b/MachineCalc.cpp index 2f70d26..312ce69 100644 --- a/MachineCalc.cpp +++ b/MachineCalc.cpp @@ -1015,18 +1015,18 @@ Machine::AdjustAngleInStroke( const STROKE& Stroke, double& dAng) const //---------------------------------------------------------------------------- bool -Machine::GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) const +Machine::GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const { // se angolo fittizio (non esiste l'asse rotante corrispondente), non c'è alcunchè da fare - if ( nId <= 0 || nId > int( m_vCalcRotAx.size())) + if ( nInd < 0 || nInd >= int( m_vCalcRotAx.size())) return true ; // cerco l'angolo più vicino stando nella corsa - while ( dAng - dAngRef > ANG_STRAIGHT && dAng - ANG_FULL >= m_vCalcRotAx[nId-1].stroke.Min) + while ( dAng - dAngRef > ANG_STRAIGHT && dAng - ANG_FULL >= m_vCalcRotAx[nInd].stroke.Min) dAng -= ANG_FULL ; - while ( dAng - dAngRef < - ANG_STRAIGHT && dAng + ANG_FULL <= m_vCalcRotAx[nId-1].stroke.Max) + while ( dAng - dAngRef < - ANG_STRAIGHT && dAng + ANG_FULL <= m_vCalcRotAx[nInd].stroke.Max) dAng += ANG_FULL ; - return ( dAng >= m_vCalcRotAx[nId-1].stroke.Min && - dAng <= m_vCalcRotAx[nId-1].stroke.Max) ; + return ( dAng >= m_vCalcRotAx[nInd].stroke.Min && + dAng <= m_vCalcRotAx[nInd].stroke.Max) ; } //----------------------------------------------------------------------------