From 39dc5e2e14f677facff734270b84db8c996ac7e7 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 10 Mar 2020 22:34:27 +0000
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=202.2c2=20:=20-=20corretto=20erro?=
 =?UTF-8?q?re=20in=20fresatura=20con=20attacco=20o=20uscita=20a=20scivolo?=
 =?UTF-8?q?=20pi=C3=B9=20lunghi=20del=20percorso=20chiuso=20e=20sovrapposi?=
 =?UTF-8?q?zione.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Milling.cpp      |  25 +++++++++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index a67e72e4221413718c94a3e9e021b02490b39f73..c7a0d6caf6823c5dd7bae977e8a08b122e7d69a6 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

delta 97
zcmewt{V#gMFE&QQ&A-`fnHdcyKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU3rBY*$^

diff --git a/Milling.cpp b/Milling.cpp
index bc54437..47bc613 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -3480,29 +3480,29 @@ Milling::AddLeadIn( const Point3d& ptP1, const Point3d& ptStart, const Vector3d&
                pCompo->GetDomain( dParS, dParE) ;
                if ( ! pCrv.Set( CreateCurveComposite())  ||  ! pCrv->AddCurve( pCompo->CopyParamRange( dU, dParE)))
                   return false ;
-               if ( m_dAddedOverlap > EPS_SMALL) {
-                  pCrv->Invert() ;
-                  pCrv->TrimStartAtLen( m_dAddedOverlap) ;
-                  pCrv->Invert() ;
-               }
             }
             else {
                if ( ! pCrv.Set( pCompo->Clone()))
                   return false ;
             }
+            if ( m_dAddedOverlap > EPS_SMALL) {
+               pCrv->Invert() ;
+               pCrv->TrimStartAtLen( m_dAddedOverlap) ;
+               pCrv->Invert() ;
+            }
          }
          else {
             double dU ;
             if ( pCompo->GetParamAtLength( m_dAddedOverlap + dTang, dU)) {
                if ( ! pCrv.Set( CreateCurveComposite())  ||  ! pCrv->AddCurve( pCompo->CopyParamRange( 0, dU)))
                   return false ;
-               if ( m_dAddedOverlap > EPS_SMALL)
-                  pCrv->TrimStartAtLen( m_dAddedOverlap) ;
             }
             else {
                if ( ! pCrv.Set( pCompo->Clone()))
                   return false ;
             }
+            if ( m_dAddedOverlap > EPS_SMALL)
+               pCrv->TrimStartAtLen( m_dAddedOverlap) ;
             pCrv->Invert() ;
          }
          pCrv->SetExtrusion( vtN) ;
@@ -3655,13 +3655,13 @@ Milling::AddLeadOut( const Point3d& ptEnd, const Vector3d& vtEnd, const Vector3d
             if ( pCompo->GetParamAtLength( m_dAddedOverlap + dTang, dU)) {
                if ( ! pCrv.Set( CreateCurveComposite())  ||  ! pCrv->AddCurve( pCompo->CopyParamRange( 0, dU)))
                   return false ;
-               if ( m_dAddedOverlap > EPS_SMALL)
-                  pCrv->TrimStartAtLen( m_dAddedOverlap) ;
             }
             else {
                if ( ! pCrv.Set( pCompo->Clone()))
                   return false ;
             }
+            if ( m_dAddedOverlap > EPS_SMALL)
+               pCrv->TrimStartAtLen( m_dAddedOverlap) ;
          }
          else {
             double dLen, dU ;
@@ -3670,17 +3670,14 @@ Milling::AddLeadOut( const Point3d& ptEnd, const Vector3d& vtEnd, const Vector3d
                pCompo->GetDomain( dParS, dParE) ;
                if ( ! pCrv.Set( CreateCurveComposite())  ||  ! pCrv->AddCurve( pCompo->CopyParamRange( dU, dParE)))
                   return false ;
-               if ( m_dAddedOverlap > EPS_SMALL) {
-                  pCrv->Invert() ;
-                  pCrv->TrimStartAtLen( m_dAddedOverlap) ;
-                  pCrv->Invert() ;
-               }
             }
             else {
                if ( ! pCrv.Set( pCompo->Clone()))
                   return false ;
             }
             pCrv->Invert() ;
+            if ( m_dAddedOverlap > EPS_SMALL)
+               pCrv->TrimStartAtLen( m_dAddedOverlap) ;
          }
          pCrv->SetExtrusion( vtN) ;
         // la porto alla giusta quota