From 2f4b643a32f538891f3cdf5b4c3f0d3386219d32 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 7 May 2020 06:56:02 +0000
Subject: [PATCH] EgtMachKernel 2.2e1 : - tolto piccolo offset interno per
 evitare problemi in preview di attacchi e uscite lama su archi.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Sawing.cpp       |  16 ++++++----------
 Sawing.h         |   4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 5e7bcd885f5f49fa6ec9d333e16757f7dc682872..c5c83068c26271ef2617fd2a6f50ea6a8309f32e 100644
GIT binary patch
delta 121
zcmewt{V#gMH#SyN1|0^&&A-{KnVC}=3@1O7)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RU}_CYS&K

delta 121
zcmewt{V#gMH#Sxi1|0^|&A-{KnVC}<Oea5-)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RVG(Ca?ei

diff --git a/Sawing.cpp b/Sawing.cpp
index e2a218a..10a1cfc 100644
--- a/Sawing.cpp
+++ b/Sawing.cpp
@@ -2401,7 +2401,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
          m_pGeomDB->SetMaterial( nId, colCut) ;
 
         // contorno per parte iniziale di taglio
-         PtrOwner<ICurveComposite> pCompo2( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 0, 0)) ;
+         PtrOwner<ICurveComposite> pCompo2( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 0)) ;
          if ( IsNull( pCompo2))
             return false ;
          pCompo2->Translate( dMyZmove * vtCorr) ;
@@ -2410,7 +2410,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
          m_pGeomDB->SetMaterial( nId2, ( bFirst ? BLUE : colCut)) ;
 
         // contorno per parte finale di taglio
-         PtrOwner<ICurveComposite> pCompo3( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 0, 0)) ;
+         PtrOwner<ICurveComposite> pCompo3( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 0)) ;
          if ( IsNull( pCompo3))
             return false ;
          pCompo3->Translate( dMyZmove * vtCorr) ;
@@ -2433,7 +2433,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
          m_pGeomDB->SetMaterial( nRrId, INVISIBLE) ;
 
         // regione di pre-taglio
-         PtrOwner<ICurveComposite> pCmpRs( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 10 * EPS_SMALL, dExtraL)) ;
+         PtrOwner<ICurveComposite> pCmpRs( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, dExtraL)) ;
          if ( IsNull( pCmpRs))
             return false ;
          SurfFlatRegionByContours SfrCntrRs ;
@@ -2447,7 +2447,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
          m_pGeomDB->SetMaterial( nRsId, INVISIBLE) ;
 
         // regione di post-taglio
-         PtrOwner<ICurveComposite> pCmpRe( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 10 * EPS_SMALL, dExtraL)) ;
+         PtrOwner<ICurveComposite> pCmpRe( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, dExtraL)) ;
          if ( IsNull( pCmpRe))
             return false ;
          SurfFlatRegionByContours SfrCntrRe ;
@@ -2526,7 +2526,7 @@ Sawing::GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double d
 //----------------------------------------------------------------------------
 ICurveComposite*
 Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
-                                double dDeltaT, double dIntOffs, double dSafety)
+                                double dDeltaT, double dSafety)
 {
   // direzione iniziale del taglio
    Vector3d vtStaDir ;
@@ -2538,8 +2538,6 @@ Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dE
    pArc->GetStartPoint( ptStart) ;
    if ( ! AreHeadWorkOnSameSide())
       ptStart -= vtStaVer * m_TParams.m_dThick ;
-   if ( dIntOffs > EPS_SMALL)
-      ptStart += vtStaVer * dIntOffs ;
   // punto prima di inizio
    Point3d ptPre = ptStart - vtStaDir * dDeltaT ;
   // punto fuori prima di inizio
@@ -2588,7 +2586,7 @@ Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dE
 //----------------------------------------------------------------------------
 ICurveComposite*
 Sawing::GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
-                                 double dDeltaT, double dIntOffs, double dSafety)
+                                 double dDeltaT, double dSafety)
 {
   // direzione finale del taglio
    Vector3d vtEndDir ;
@@ -2600,8 +2598,6 @@ Sawing::GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double d
    vtEndVer.Normalize() ;
    if ( ! AreHeadWorkOnSameSide())
       ptEnd -= vtEndVer * m_TParams.m_dThick ;
-   if ( dIntOffs > EPS_SMALL)
-      ptEnd += vtEndVer * dIntOffs ;
   // punto dopo fine
    Point3d ptPost = ptEnd + vtEndDir * dDeltaT ;
   // punto fuori dopo fine
diff --git a/Sawing.h b/Sawing.h
index f7e992b..e504fc1 100644
--- a/Sawing.h
+++ b/Sawing.h
@@ -94,9 +94,9 @@ class Sawing : public Machining
       ICurveComposite* GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
                                                 double dSafety) ;
       ICurveComposite* GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
-                                               double dDeltaT, double dIntOffs, double dSafety) ;
+                                               double dDeltaT, double dSafety) ;
       ICurveComposite* GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
-                                                double dDeltaT, double dIntOffs, double dSafety) ;
+                                                double dDeltaT, double dSafety) ;
       bool GenerateExtCurveCl( const ICurveComposite* pCrv,
                                double dElev, double dExtraCut, const std::string& sName, int nClId) ;
       bool ProcessIntArc( const ICurve* pCrvP, const ICurveArc* pArcC, const ICurve* pCrvN,