From f64370e2dfa2dd4caf5011274d996c118cbdbd57 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 8 Jun 2020 10:33:31 +0000
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=202.2f4=20:=20-=20in=20fresatura?=
 =?UTF-8?q?=20la=20lunghezza=20dei=20tab=20=C3=A8=20ora=20riferita=20al=20?=
 =?UTF-8?q?maetriale=20lasciato=20(sul=20centro=20fresa=20=C3=A8=20aumenta?=
 =?UTF-8?q?ta=20del=20diametro).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Milling.cpp      |   7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 49d798c5c715e19d6051cf207586a9e59bb8dd0d..b486db4fd73ea96377ed03a58e21c5f936967221 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/Milling.cpp b/Milling.cpp
index bd5d82e..1415e0c 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -4181,10 +4181,11 @@ bool
 Milling::AdjustTabsParams( const ICurve* pCrv, bool& bPathTabsEnable, double& dTabsRampLen, double& dTabsBottomLen, double& dTabsTopLen)
 {
   // se ci sono i tab cerco di aggiustare le lunghezze dei Bottom per finire con la stessa quota di partenza
+   double dTabLen = m_Params.m_dTabLen + m_TParams.m_dDiam ;
    double dTabAngle = Clamp( abs( m_Params.m_dTabAngle), 15., 75.) ;
-   dTabsRampLen = min( abs( m_Params.m_dTabHeight) / tan( dTabAngle * DEGTORAD), abs( m_Params.m_dTabLen) / 2 - OSC_MIN_LEN) ;
-   dTabsTopLen = abs( m_Params.m_dTabLen) - 2 * dTabsRampLen ;
-   dTabsBottomLen = abs( m_Params.m_dTabDist) - abs( m_Params.m_dTabLen) ;
+   dTabsRampLen = min( abs( m_Params.m_dTabHeight) / tan( dTabAngle * DEGTORAD), abs( dTabLen) / 2 - OSC_MIN_LEN) ;
+   dTabsTopLen = abs( dTabLen) - 2 * dTabsRampLen ;
+   dTabsBottomLen = abs( m_Params.m_dTabDist) - abs( dTabLen) ;
    if ( bPathTabsEnable) {
      // lunghezza del percorso
       double dLen ; pCrv->GetLength( dLen) ; dLen -= m_dAddedOverlap ;