From 3988809c7ecce579cd6cd10cfe128325f04597b2 Mon Sep 17 00:00:00 2001
From: SaraP <sara.perdoncin@egalware.com>
Date: Tue, 5 Jul 2022 16:26:13 +0200
Subject: [PATCH] 3dPrinting : - nel lead out dei setti corretta la distinzione
 fra coasting e wipe.

---
 LuaLibs/AddManData.lua   |  4 ++--
 LuaLibs/CalcToolPath.lua | 39 +++++++++++++++++++--------------------
 LuaLibs/RunSlicing.lua   |  4 ++--
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/LuaLibs/AddManData.lua b/LuaLibs/AddManData.lua
index 116aac4..85f7dbf 100644
--- a/LuaLibs/AddManData.lua
+++ b/LuaLibs/AddManData.lua
@@ -77,8 +77,8 @@ KEY_RIBS_LEAD_IN_INVERT = "RibsLeadInInvert"
 KEY_RIBS_LEAD_IN_LEN = "RibsLeadInLen"
 KEY_RIBS_LEAD_OUT_INVERT = "RibsLeadOutInvert"
 KEY_RIBS_LEAD_OUT_LEN = "RibsLeadOutLen"
-KEY_RIBS_LEAD_OUT_WIPE1 = "RibsLeadOutWipeTang"
-KEY_RIBS_LEAD_OUT_WIPE2 = "RibsLeadOutWipe"
+KEY_RIBS_LEAD_OUT_COASTING = "RibsLeadOutCoasting"
+KEY_RIBS_LEAD_OUT_WIPE = "RibsLeadOutWipe"
 KEY_RIBS_LEAD_OUT_WIPE_DIR = "RibsLeadOutWipeDir"
 
 -- Parametri di macchina
diff --git a/LuaLibs/CalcToolPath.lua b/LuaLibs/CalcToolPath.lua
index 92a7ccc..2d55e14 100644
--- a/LuaLibs/CalcToolPath.lua
+++ b/LuaLibs/CalcToolPath.lua
@@ -45,8 +45,8 @@ local function GetLayerParamsForToolPathCalc()
    LayerParams.dRibsLILen = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_IN_LEN, 'd')
    LayerParams.bRibsLOInvert = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_INVERT, 'b')
    LayerParams.dRibsLOLen = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_LEN, 'd')
-   LayerParams.dRibsLOWipeTang = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_WIPE1, 'd')
-   LayerParams.dRibsLOWipe = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_WIPE2, 'd')
+   LayerParams.dRibsLOCoasting = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_COASTING, 'd')
+   LayerParams.dRibsLOWipe = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_WIPE, 'd')
    LayerParams.dRibsLOWipeAng = EgtGetInfo( s_nPartId, KEY_RIBS_LEAD_OUT_WIPE_DIR, 'd')
    
    return LayerParams 
@@ -291,7 +291,7 @@ end
 local function AddRibsLeadOut( nCrv, nTPathGrp, nLoopsGrp, LayerParams)
    
    if abs( LayerParams.dRibsLOLen) < GEO.EPS_SMALL and 
-      abs( LayerParams.dRibsLOWipeTang) < GEO.EPS_SMALL and 
+      abs( LayerParams.dRibsLOCoasting) < GEO.EPS_SMALL and 
       abs( LayerParams.dRibsLOWipe) < GEO.EPS_SMALL then return end
    
    local ptE = EgtEP( nCrv)
@@ -302,6 +302,7 @@ local function AddRibsLeadOut( nCrv, nTPathGrp, nLoopsGrp, LayerParams)
       if dParE then
          
          local nCrvLO
+         local nCoasting
          local nWipe
          local bInvert = false
          
@@ -345,13 +346,18 @@ local function AddRibsLeadOut( nCrv, nTPathGrp, nLoopsGrp, LayerParams)
          end 
       
          -- secondo tratto ( segue offset con flusso chiuso) 
-         if LayerParams.dRibsLOWipeTang > GEO.EPS_SMALL then
-            nWipe = EgtCopyGlob( nCrvRef, nCrvLO or nCrv, GDB_IN.AFTER)
-            EgtTrimCurveStartAtLen( nWipe, LayerParams.dRibsLOLen) 
-            EgtTrimCurveEndAtLen( nWipe, LayerParams.dRibsLOWipeTang)  
+         if LayerParams.dRibsLOCoasting > GEO.EPS_SMALL then
+            nCoasting = EgtCopyGlob( nCrvRef, nCrvLO or nCrv, GDB_IN.AFTER)
+            EgtTrimCurveStartAtLen( nCoasting, LayerParams.dRibsLOLen) 
+            EgtTrimCurveEndAtLen( nCoasting, LayerParams.dRibsLOCoasting)
+            
+            EgtSetName( nCoasting, COASTING_CRV)
+            EgtSetInfo( nCoasting, KEY_TYPE, TYPE.COASTING)
+            EgtSetColor( nCoasting, EgtStdColor('ORANGE'))
+            
             -- aggiorno ptE e vtE
-            ptE = EgtEP( nWipe)
-            vtE = EgtEV( nWipe)
+            ptE = EgtEP( nCoasting)
+            vtE = EgtEV( nCoasting)
          end
          EgtErase( nCrvRef)
          
@@ -360,20 +366,13 @@ local function AddRibsLeadOut( nCrv, nTPathGrp, nLoopsGrp, LayerParams)
             local dAng = EgtIf( bInvert, 90, - 90) + LayerParams.dRibsLOWipeAng
             vtE:rotate( LayerParams.vtSlicing, dAng)
             local ptFinal = ptE + vtE * LayerParams.dRibsLOWipe
-            if nWipe then
-               -- unisco al secondo tratto così da averne uno solo per il wiping 
-               EgtAddCurveCompoLine( nWipe, ptFinal)
-            else
-               nWipe = EgtCurveCompoFromPoints( nTPathGrp, { ptE, ptFinal})
-               EgtRelocateGlob( nWipe, nCrvLO or nCrv, GDB_IN.AFTER)
-            end
-         end
-      
-         if nWipe then
+            nWipe = EgtCurveCompoFromPoints( nTPathGrp, { ptE, ptFinal})
+            EgtRelocateGlob( nWipe, nCoasting or nCrvLO or nCrv, GDB_IN.AFTER)
             EgtSetName( nWipe, WIPE_CRV)
             EgtSetInfo( nWipe, KEY_TYPE, TYPE.WIPE)
-            EgtSetColor( nWipe, EgtStdColor('TEAL'))
+            EgtSetColor( nWipe, EgtStdColor('TEAL'))            
          end
+         
          return 
       end
       
diff --git a/LuaLibs/RunSlicing.lua b/LuaLibs/RunSlicing.lua
index 31c1531..b8261c8 100644
--- a/LuaLibs/RunSlicing.lua
+++ b/LuaLibs/RunSlicing.lua
@@ -125,8 +125,8 @@ local function LoadParams( sFile, nPartId)
    SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_IN_LEN, '0.0')
    SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_INVERT, '0')
    SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_LEN, '0.0')
-   SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_WIPE1, '0.0')
-   SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_WIPE2, '0.0')
+   SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_COASTING, '0.0')
+   SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_WIPE, '0.0')
    SetParamInfo( sFile, nPartId, SEC_DEFAULT, KEY_RIBS_LEAD_OUT_WIPE_DIR, '0.0')   
 end