From 2e6abe561d494f86e419efa1fefffdea4ccb3f05 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 26 Sep 2024 20:00:17 +0200
Subject: [PATCH] EgtMachKernel 2.6i3 : - riportata in PocketingNT da Pocketing
 la correzione per caso limite dimensione tasca quasi uguale a dimensione
 utensile - ricompilato con POCKETING_NT 0 per abilitare vecchio Pocketing.

---
 EgtMachKernel.rc              | Bin 11774 -> 11774 bytes
 EgtMachKernel.vcxproj.filters |   6 ++++++
 OperationConst.h              |   2 +-
 PocketingNT.cpp               |   4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index cfd6b7664fef2ef2d4a049cf4d8e8e2dd1759b0c..7c07ad05178f2203246f881c9d0b7e45fdbe76a4 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUD-Bai?9

delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

diff --git a/EgtMachKernel.vcxproj.filters b/EgtMachKernel.vcxproj.filters
index 8c0d39e..884c3d5 100644
--- a/EgtMachKernel.vcxproj.filters
+++ b/EgtMachKernel.vcxproj.filters
@@ -249,6 +249,9 @@
     <ClCompile Include="SimulatorMP.cpp">
       <Filter>Source Files\Output</Filter>
     </ClCompile>
+    <ClCompile Include="PocketingNT.cpp">
+      <Filter>Source Files\Operations</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DllMain.h">
@@ -761,6 +764,9 @@
     <ClInclude Include="Simulator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="PocketingNT.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="EgtMachKernel.rc">
diff --git a/OperationConst.h b/OperationConst.h
index d7d2d06..84a6102 100644
--- a/OperationConst.h
+++ b/OperationConst.h
@@ -18,7 +18,7 @@
 #include "/EgtDev/Include/EMkOperationConst.h"
 #include <string>
 
-#define POCKETING_NT 1
+#define POCKETING_NT 0
 
 //----------------------------------------------------------------------------
 static const std::string s_OpeClass[] = {"",
diff --git a/PocketingNT.cpp b/PocketingNT.cpp
index 4e9659b..62e9bd4 100644
--- a/PocketingNT.cpp
+++ b/PocketingNT.cpp
@@ -3903,8 +3903,8 @@ PocketingNT::CalcSpiral( const ICurveComposite* pCompo, int nReg, bool bSplitArc
          CalcCurveLimitOffset( *pCompo, dMaxOffs) ;
       else
          CalcCurveLimitOffset( *pOffs, dMaxOffs) ;
-      if ( abs( dMaxOffs - dOffs) < EPS_SMALL)
-         dOffs -= EPS_SMALL ;
+      if ( dOffs > dMaxOffs - 10 * EPS_ZERO  &&  dOffs < dMaxOffs + EPS_SMALL)
+         dOffs = dMaxOffs - 10 * EPS_ZERO ;
 
      // calcolo
       OffsetCurve OffsCrv ;