From 05baa2f0fc33100a7b2d0e6165671436140b92dd Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Fri, 12 Jul 2024 17:37:52 +0200 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=20:=20-=20aggiunta=20la=20possibi?= =?UTF-8?q?lit=C3=A0=20di=20non=20calcolare=20i=20percorsi=20ottinimizzati?= =?UTF-8?q?=20in=20lavorazioni=20che=20richiamano=20CalcPocketing.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SurfFinishing.cpp | 6 +++--- SurfRoughing.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp index 9561562..5a54667 100644 --- a/SurfFinishing.cpp +++ b/SurfFinishing.cpp @@ -1385,7 +1385,7 @@ SurfFinishing::AddZigZag( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons double dPockRadOffs = m_TParams.m_dDiam / 2 - m_Params.m_dSideStep - m_Params.m_dOverlap ; ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrPock, dPockRad, dPockRadOffs, m_Params.m_dSideStep, m_Params.m_dSideAngle, - POCKET_ZIGZAG, false, false, nullptr, vpCrvs)) { + POCKET_ZIGZAG, false, false, true, nullptr, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; } @@ -1586,7 +1586,7 @@ SurfFinishing::AddOneWay( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons double dPockRadOffs = m_TParams.m_dDiam / 2 - m_Params.m_dSideStep - m_Params.m_dOverlap ; ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrPock, dPockRad, dPockRadOffs, m_Params.m_dSideStep, m_Params.m_dSideAngle, - POCKET_ONEWAY, false, false, nullptr, vpCrvs)) { + POCKET_ONEWAY, false, false, true, nullptr, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; } @@ -1788,7 +1788,7 @@ SurfFinishing::AddSpiral( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons int nType = ( bInVsOut ? POCKET_SPIRALIN : POCKET_SPIRALOUT) ; ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrPock, dPockRad, dPockRadOffs, m_Params.m_dSideStep, m_Params.m_dSideAngle, - nType, false, false, nullptr, vpCrvs)) { + nType, false, false, true, nullptr, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; } diff --git a/SurfRoughing.cpp b/SurfRoughing.cpp index 002ba42..9e586ca 100644 --- a/SurfRoughing.cpp +++ b/SurfRoughing.cpp @@ -1804,7 +1804,7 @@ SurfRoughing::AddPocket( const INTINTVECTOR& vPocket, const Vector3d& vtTool, co ICRVCOMPOPOVECTOR vpCrvs ; // percorso di svuotatura // se si tratta di uno step base, allora lavoro l'intera superficie if ( ! CalcPocketing( pSfrPock, m_TParams.m_dDiam / 2, 0., m_Params.m_dSideStep, m_Params.m_dSideAngle, - nSubType, true, bInvert, pSfrLimit, vpCrvs)) { + nSubType, true, bInvert, false, pSfrLimit, vpCrvs)) { m_pMchMgr->SetLastError( 3028, "Error in SurfRoughing : Error in CalcPocketing") ; return false ; }