From 28686fe6b62d2313d80ab105f08dba8cbfd58d01 Mon Sep 17 00:00:00 2001
From: SaraP <sara.perdoncin@egalware.com>
Date: Wed, 9 Aug 2023 17:34:16 +0200
Subject: [PATCH] 3dPrinting : - introdotta info con numero totale di layers.

---
 LuaLibs/AddManData.lua   |  1 +
 LuaLibs/CalcSlices.lua   |  2 +-
 LuaLibs/CalcToolPath.lua | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/LuaLibs/AddManData.lua b/LuaLibs/AddManData.lua
index ff0e1c0..895aef3 100644
--- a/LuaLibs/AddManData.lua
+++ b/LuaLibs/AddManData.lua
@@ -194,6 +194,7 @@ KEY_INTERNAL_SRF_LOOP = "InternalSrfLoop"
 KEY_PREV_CRV = "PrevCrv"
 KEY_NEXT_CRVS = "NextCrvs"
 KEY_CRV_STRAND = "CurveStrand"
+KEY_LAYER_CNT = "LayerCnt"
 
 SLICING_TYPE = {
    VERTICAL = 1,
diff --git a/LuaLibs/CalcSlices.lua b/LuaLibs/CalcSlices.lua
index 3a84ed9..85a8f1b 100644
--- a/LuaLibs/CalcSlices.lua
+++ b/LuaLibs/CalcSlices.lua
@@ -134,7 +134,7 @@ local function GetAuxSolidsParams( nId)
    
    local AuxSolidsParam = {}
    ReadParam( nId, KEY_AUX_SOLIDS_STRAND, 'd', s_dStrand, AuxSolidsParam)
-   RibParam[KEY_RIBS_STRAND] = EgtClamp( RibParam[KEY_RIBS_STRAND], 0.5 * s_dStrand, 1.5 * s_dStrand)
+   AuxSolidsParam[KEY_RIBS_STRAND] = EgtClamp( AuxSolidsParam[KEY_RIBS_STRAND], 0.5 * s_dStrand, 1.5 * s_dStrand)
    ReadParam( nId, KEY_AUX_SOLIDS_SHELLS_NBR, 'i', 0, AuxSolidsParam)
    ReadParam( nId, KEY_AUX_SOLIDS_OVERLAP, 'd', 0, AuxSolidsParam)
    ReadParam( nId, KEY_AUX_SOLIDS_INFILL, 'i', FILL_TYPE.NONE, AuxSolidsParam)
diff --git a/LuaLibs/CalcToolPath.lua b/LuaLibs/CalcToolPath.lua
index 07cefb0..c3d5454 100644
--- a/LuaLibs/CalcToolPath.lua
+++ b/LuaLibs/CalcToolPath.lua
@@ -1885,7 +1885,7 @@ function CalcToolPath.Exec( nPartId)
    end
 
    local b3Tot = BBox3d() -- box dei toolpath
-   
+   local nLayCnt = 1
    -- Ciclo sui layer
    for nIdx = 1, #vLayIds do
       
@@ -1968,6 +1968,11 @@ function CalcToolPath.Exec( nPartId)
          local b3Box = ComputeToolPathBox( nTpathGrpId)
          b3Tot:Add( b3Box)
          
+         -- verifico non sia vuoto per aggiornare il numero di layers
+         if EgtGetFirstInGroup( nTpathGrpId) then
+            nLayCnt = nIdx
+         end
+         
          -- passo al gruppo di contorni successivo
          nCrvGrpId = EgtGetNextName( nCrvGrpId, CONTOUR_GRP.."*")
       end
@@ -1981,6 +1986,9 @@ function CalcToolPath.Exec( nPartId)
    -- correzione in z
    AddZCorrection( b3Tot, LayerParams)
    
+   -- setto info con numero di layers effettivi
+   EgtSetInfo( nPartId, KEY_LAYER_CNT, nLayCnt)
+      
    return true
 end