From 9bb22b11bd7916dc0355754d8fd375daeb096e56 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 19 May 2022 08:37:05 +0200 Subject: [PATCH] EgtMachKernel 2.4e4 : - piccole migliorie nell'approccio e retrazione delle svuotature. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes Pocketing.cpp | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index e3d92103a2e7a02d40dda2a1289cc3bc1bb15d43..711d35f0a88a1f91b274a9c5382c6f0b732fe5ae 100644 GIT binary patch delta 97 zcmewt{V#gMFE&P#&A-`fnHfzcKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUI`BbWdH delta 97 zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUD-Bai?9 diff --git a/Pocketing.cpp b/Pocketing.cpp index 72cc99c..9fc91da 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -3446,6 +3446,8 @@ Pocketing::AddSpiralIn( const ICurveComposite* pCompo, const Vector3d& vtTool, c m_pMchMgr->SetLastError( 2416, "Error in Pocketing : LeadOut not computable") ; return false ; } + if ( ! m_bAboveHead) + dEndElev = max( dEndElev, j * dStep) ; // aggiungo retrazione if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr)) { m_pMchMgr->SetLastError( 2417, "Error in Pocketing : Retract not computable") ; @@ -3578,7 +3580,7 @@ Pocketing::AddSpiralOut( const ICurveComposite* pCompo, const Vector3d& vtTool, dStElev = dStep ; bool bUnderRaw = m_bAboveHead && ! m_bAggrBottom && GetPointUnderRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, vtTool, dStElev) ; - if ( bUnderRaw) + if ( bUnderRaw || ( bOutStart && ! m_bAboveHead)) dStElev = max( dStElev, dStep) ; dStElev -= ( ptP1 - ptStart) * vtExtr ; // se attacco a zigzag o a spirale o a scivolo, l'elevazione va nell'attacco @@ -3670,6 +3672,8 @@ Pocketing::AddSpiralOut( const ICurveComposite* pCompo, const Vector3d& vtTool, m_pMchMgr->SetLastError( 2416, "Error in Pocketing : LeadOut not computable") ; return false ; } + if ( ! m_bAboveHead) + dEndElev = max( dEndElev, j * dStep) ; // aggiungo retrazione if ( ! AddRetract( ptQ, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr)) { m_pMchMgr->SetLastError( 2417, "Error in Pocketing : Retract not computable") ;