3dPrinting :

- corretto errore nel calcolo dei solidi.

.gitlab-ci.yml

@@ -16,14 +16,14 @@ variables:
     $FileList = Get-ChildItem("*.lua")
     ForEach ($File in $FileList) {
       $FileName = Split-Path $File -leaf
-      lua54 -o bin\$FileName $FileName
-      echo "lua54 -o bin\$FileName $FileName"
+      lua54 -o bin\$FileName -s $FileName
+      echo "lua54 -o bin\$FileName -s $FileName"
     }
     $FileList = Get-ChildItem("LuaLibs\*.lua")
     ForEach ($File in $FileList) {
       $FileName = Split-Path $File -leaf
-      lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName
-      echo "lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName"
+      lua54 -o bin\LuaLibs\$FileName -s LuaLibs\$FileName
+      echo "lua54 -o bin\LuaLibs\$FileName -s LuaLibs\$FileName"
     }
 
 # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI

.vscode/settings.json

@@ -0,0 +1,34 @@
+{
+    "Lua.diagnostics.globals": [
+        "MATERIAL",
+        "EgtGetFirstNameInGroup",
+        "GDB_ID",
+        "EgtGroup",
+        "EgtSetLevel",
+        "EgtSetName",
+        "GDB_LV",
+        "EgtGetCurrMachineDir",
+        "EgtGetCurrMachineName",
+        "EgtGetStringFromIni",
+        "EgtGetFirstPart",
+        "EgtGetInfo",
+        "EgtGetNextPart",
+        "EgtGetLastNameInGroup",
+        "EgtRemoveInfo",
+        "EgtGetFirstInGroup",
+        "EgtGetName",
+        "EgtCurveLength",
+        "EgtGetNext",
+        "EgtCurveArea",
+        "EgtGetNextName",
+        "EgtSetInfo",
+        "floor",
+        "pi",
+        "pow",
+        "EgtProcessEvents",
+        "EgtEmptyGroup",
+        "EgtOutLog",
+        "EgtIf",
+        "EgtProtectGlobal"
+    ]
+}

Compile.bat

@@ -1,19 +1,21 @@
 
-REM Compilazione degli script 3dPrinting Egaltech                         2023.01.11
+REM Compilazione degli script 3dPrinting Egaltech                         2024.03.27
 REM Per togliere info di debug aggiungere flag -s prima del nome del file di input
 
 REM Compilazione 32 e 64 bit
 
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\AddManData.lua                    LuaLibs\AddManData.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcPaths.lua                     LuaLibs\CalcPaths.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcSlices.lua                    LuaLibs\CalcSlices.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcToolPath.lua                  LuaLibs\CalcToolPath.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunCalcSolids.lua                 LuaLibs\RunCalcSolids.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunGcodeGenerate.lua              LuaLibs\RunGcodeGenerate.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMachParamFromSWCalc.lua        LuaLibs\RunMachParamFromSWCalc.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunSlicing.lua                    LuaLibs\RunSlicing.lua
-\EgtProg\Dll32\luac54 -o bin\CalcMachParamFromSW.lua                   CalcMachParamFromSW.lua
-\EgtProg\Dll32\luac54 -o bin\CalcSolids.lua                            CalcSolids.lua
-\EgtProg\Dll32\luac54 -o bin\GcodeGenerate.lua                         GcodeGenerate.lua
-\EgtProg\Dll32\luac54 -o bin\Slicing.lua                               Slicing.lua
-\EgtProg\Dll32\luac54 -o bin\Version.lua                               Version.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\AddManData.lua                  -s LuaLibs\AddManData.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcPaths.lua                   -s LuaLibs\CalcPaths.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcSlices.lua                  -s LuaLibs\CalcSlices.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcToolPath.lua                -s LuaLibs\CalcToolPath.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunCalcSolids.lua               -s LuaLibs\RunCalcSolids.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunGcodeGenerate.lua            -s LuaLibs\RunGcodeGenerate.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMachParamFromSWCalc.lua      -s LuaLibs\RunMachParamFromSWCalc.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunPrepareExport.lua            -s LuaLibs\RunPrepareExport.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunSlicing.lua                  -s LuaLibs\RunSlicing.lua
+\EgtProg\Dll32\luac54 -o bin\CalcMachParamFromSW.lua                 -s CalcMachParamFromSW.lua
+\EgtProg\Dll32\luac54 -o bin\CalcSolids.lua                          -s CalcSolids.lua
+\EgtProg\Dll32\luac54 -o bin\GcodeGenerate.lua                       -s GcodeGenerate.lua
+\EgtProg\Dll32\luac54 -o bin\PrepareExport.lua                       -s PrepareExport.lua
+\EgtProg\Dll32\luac54 -o bin\Slicing.lua                             -s Slicing.lua
+\EgtProg\Dll32\luac54 -o bin\Version.lua                             -s Version.lua

LuaLibs/AddManData.lua

@@ -28,8 +28,12 @@ LINK_CRV = "Link"
 FRAME_PART = "FramePart"
 START_GEOM = "Start"
 TOT_SHELL_TRIM_SURF = "TotalShellSurfForTrim"
+SHELL_SURF = "ShellSurf"
+COARSE_TRIM_SURF = "CoarseTrimSurf"
 TRIM_SURF_LOOP = "TrimSurfLoop"
 SURF_LOOP = "SurfLoop"
+LOOP_GRP = "LoopGrp"
+DIR_ARROW = "Arrow"
 
 MIN_LEN = 0.1
 MIN_AREA = 0.01
@@ -134,6 +138,10 @@ KEY_RIBS_USER_LINK_CCW = "RibUserLinkCCW"
 KEY_RIBS_USER_LINK_ORDER = "RibUserLinkOrder"
 KEY_RIBS_USER_LINK_TOT = "RibsUserLinkParts"
 KEY_RIBS_INVERT_STRAND_ORDER = "RibsInvertStrandOrder"
+KEY_RIBS_MERGE_WITH_SHELLS = "RibsMergeWithShell"
+KEY_INVERT_RIBS_MERGED_SHELL_LINK = "InvertRibsMergedShellMainLink"
+KEY_RIBS_LEAD_FILLET = "RibsLeadFillet"
+KEY_RIBS_LINK_FILLET = "RibsLinkFillet"
 
 -- Regioni con diverso numero di passate
 KEY_SHELL_NBR_DIFF = "ShellNbrDifference"
@@ -196,6 +204,9 @@ KEY_PREV_CRV = "PrevCrv"
 KEY_NEXT_CRVS = "NextCrvs"
 KEY_CRV_STRAND = "CurveStrand"
 KEY_LAYER_CNT = "LayerCnt"
+KEY_CRV_OFFSET = "CurveOffset"
+KEY_ORIG_REF = "Orig"
+KEY_WIPE_ON_CRV = "WipeOnCrv"
 
 SLICING_TYPE = {
    VERTICAL = 1,
@@ -288,6 +299,7 @@ LAY_FRAME = "Frame"
 VIEWPARAMS = 'ViewParams'
 IMPORTED_SOLID = 'ImportedSolid'
 RESULT_READ_PROG = 'ResultReadProg'
+LAY_EXPORT = "ExportLayer"
 
 KEY_PART_ON_TABLE = 'PartOnTable'
 KEY_RESULT = 'Result'

LuaLibs/CalcSlices.lua

@@ -104,7 +104,9 @@ local function GetRibParams( nId)
 
    local RibParam = {}
    ReadParam( nId, KEY_RIBS_STRAND, 'd', s_dStrand, RibParam)
-   RibParam[KEY_RIBS_STRAND] = EgtClamp( RibParam[KEY_RIBS_STRAND], 0.5 * s_dStrand, 1.5 * s_dStrand)
+   if RibParam[KEY_RIBS_STRAND] < GEO.EPS_SMALL then
+      RibParam[KEY_RIBS_STRAND] = s_dStrand
+   end
    ReadParam( nId, KEY_RIBS_SHELLS_NBR, 'i', 0, RibParam)
    ReadParam( nId, KEY_RIBS_INVERT_DIR, 'b', false, RibParam)
    ReadParam( nId, KEY_RIBS_LEAD_IN_INVERT, 'b', false, RibParam)
@@ -118,7 +120,10 @@ local function GetRibParams( nId)
    ReadParam( nId, KEY_RIBS_LINK, 'b', false, RibParam)
    ReadParam( nId, KEY_RIBS_TYPE, 'i', RIB_TYPE.INTERNAL, RibParam)
    ReadParam( nId, KEY_RIBS_INVERT_STRAND_ORDER, 'b', false, RibParam)
-  
+   ReadParam( nId, KEY_RIBS_MERGE_WITH_SHELLS, 'b', false, RibParam)
+   ReadParam( nId, KEY_RIBS_LEAD_FILLET, 'd', 0, RibParam)
+   ReadParam( nId, KEY_RIBS_LINK_FILLET, 'd', 0, RibParam)
+   
    return RibParam
 end
 
@@ -139,7 +144,9 @@ local function GetAuxSolidsParams( nId)
    
    local AuxSolidsParam = {}
    ReadParam( nId, KEY_AUX_SOLIDS_STRAND, 'd', s_dStrand, AuxSolidsParam)
-   AuxSolidsParam[KEY_AUX_SOLIDS_STRAND] = EgtClamp( AuxSolidsParam[KEY_AUX_SOLIDS_STRAND], 0.5 * s_dStrand, 1.5 * s_dStrand)
+   if AuxSolidsParam[KEY_AUX_SOLIDS_STRAND] < GEO.EPS_SMALL then
+      AuxSolidsParam[KEY_AUX_SOLIDS_STRAND] = s_dStrand
+   end
    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)
@@ -631,7 +638,9 @@ local function PrepareInfill( nStmId, vtSlicing)
    local dGridOverlap = EgtGetInfo( s_nPartId, KEY_INFILL_GRID_OVERLAP, 'd') or 0
    local dOffsStm = EgtGetInfo( s_nPartId, KEY_OFFSET_SLICE, 'd')
    local dStrand = EgtGetInfo( s_nPartId, KEY_INFILL_STRAND, 'd') or s_dStrand
-   dStrand = EgtClamp( dStrand, 0.5 * s_dStrand, 1.5 * s_dStrand)
+   if dStrand < GEO.EPS_SMALL then
+      dStrand = s_dStrand
+   end
    
    -- creo gruppo per infill
    local nInfillGrp = EgtGroup( s_nPartId)
@@ -665,7 +674,9 @@ local function PrepareAuxSolidsInfill( nSolidsLay, vtSlicing)
                local dOffsY = ReadParam( vIds[i], KEY_AUX_SOLIDS_OFFSET_Y, 'd', 0)
                local dGridOverlap = ReadParam( vIds[i], KEY_AUX_SOLIDS_GRID_OVERLAP, 'd', 0)
                local dStrand = ReadParam( vIds[i], KEY_AUX_SOLIDS_STRAND, 'd', s_dStrand)
-               dStrand = EgtClamp( dStrand, 0.5 * s_dStrand, 1.5 * s_dStrand)
+               if dStrand < GEO.EPS_SMALL then
+                  dStrand = s_dStrand
+               end
                
                -- creo gruppo associato
                local nInfillGrp = EgtGroup( s_nPartId)
@@ -1032,17 +1043,17 @@ local function SlicingWithSolid( nStmId, vZSlices, dDeltaZStart, dZmin, frSlicin
       nLayId = EgtGetNext( nLayId)
    end
 
+   -- costolature
+   local nRibsLay = EgtGetFirstNameInGroup( s_nPartId, LAY_RIBS)
+   ExtractRibsLoops( nRibsLay, nStmId)
+   SlicingExtraObjects( nRibsLay, vtSlicing, TYPE.RIB, RIBS_CRV, RIBS_GRP, nStmId)
+   if EgtProcessEvents( EgtIf( PRINT, 100, 0) + ( #vZSlices + 3) / nCounterTot * 100, 0) == 1 then return false end
+   
    local bSpiralVase = EgtGetInfo( s_nPartId, KEY_SPIRAL_VASE, 'b') or false
    if not bSpiralVase then
       
       -- infill
       PrepareInfill( nStmId, vtSlicing)
-      if EgtProcessEvents( EgtIf( PRINT, 100, 0) + ( #vZSlices + 3) / nCounterTot * 100, 0) == 1 then return false end
-
-      -- costolature
-      local nRibsLay = EgtGetFirstNameInGroup( s_nPartId, LAY_RIBS)
-      ExtractRibsLoops( nRibsLay, nStmId)
-      SlicingExtraObjects( nRibsLay, vtSlicing, TYPE.RIB, RIBS_CRV, RIBS_GRP, nStmId)
       if EgtProcessEvents( EgtIf( PRINT, 100, 0) + ( #vZSlices + 6) / nCounterTot * 100, 0) == 1 then return false end
       
       -- solidi per regioni con diverso numero di passate

LuaLibs/CalcToolPath.lua

@@ -15,7 +15,9 @@ local AMD = require( 'AddManData')
 ---------------------------------------------------------------------
 local s_nPartId
 local s_nDefaultWipeAng = -90   -- angolo = 0° per wipe significa che esce ortogonalmente alla direzione del movimento
-local s_dHMin
+local s_dApproxTol = 0.1
+local s_dHSafeWipe = 2
+local s_nCurrIdx
 
 ---------------------------------------------------------------------
 local function GetLayerParamsForToolPathCalc()
@@ -23,7 +25,7 @@ local function GetLayerParamsForToolPathCalc()
    LayerParams.bSpiralVase = EgtGetInfo( s_nPartId, KEY_SPIRAL_VASE, 'b') or false
    LayerParams.dStrand = EgtGetInfo( s_nPartId, KEY_STRAND, 'd')
    LayerParams.dInnerStrand = EgtGetInfo( s_nPartId, KEY_INNER_STRAND, 'd') or LayerParams.dStrand
-   LayerParams.dInnerStrand = EgtClamp( LayerParams.dInnerStrand, 0.5 * LayerParams.dStrand, 1.5 * LayerParams.dStrand)
+   if LayerParams.dInnerStrand < GEO.EPS_SMALL then LayerParams.dInnerStrand = LayerParams.dStrand end
    LayerParams.dLayHeight = EgtGetInfo( s_nPartId, KEY_SLICE_STEP, 'd')
    LayerParams.dOffs = EgtGetInfo( s_nPartId, KEY_OFFSET_SLICE, 'd')
    LayerParams.bInvert = ( EgtGetInfo( s_nPartId, KEY_PRINT_DIRECTION, 'i') == PRINT_DIRECTION.CW)
@@ -46,7 +48,7 @@ local function GetLayerParamsForToolPathCalc()
    LayerParams.dTDiam = EgtGetInfo( s_nPartId, KEY_TOOL_DIAM, 'd')
    -- parametri infill
    LayerParams.dInfillStrand = EgtGetInfo( s_nPartId, KEY_INFILL_STRAND, 'd') or LayerParams.dStrand
-   LayerParams.dInfillStrand = EgtClamp( LayerParams.dInfillStrand, 0.5 * LayerParams.dStrand, 1.5 * LayerParams.dStrand)
+   if LayerParams.dInfillStrand < GEO.EPS_SMALL then LayerParams.dInfillStrand = LayerParams.dStrand end
    LayerParams.bInfillLink = EgtGetInfo( s_nPartId, KEY_INFILL_LINK, 'b') or false
    LayerParams.dInfillCoasting = EgtGetInfo( s_nPartId, KEY_INFILL_COASTING, 'd') or 0
    LayerParams.dInfillWipe = EgtGetInfo( s_nPartId, KEY_INFILL_WIPE, 'd') or 0
@@ -83,7 +85,7 @@ local function AddZCorrection( b3Box, LayerParams)
    local dHTool = LayerParams.dTDiam / 2 * dNxy
    -- altezza disponibile
    local dHBox = EgtGetInfo( s_nPartId, KEY_BOX_MIN_Z, 'i') or 0
-   local dHDisp = b3Box:getMin():getZ() - dHBox
+   local dHDisp = b3Box:getMin():getZ() - max( dHBox, 0)
    
    local dCorrZ = max( 0, max( dHStrand, dHTool) - dHDisp)
    
@@ -95,21 +97,42 @@ local function AddZCorrection( b3Box, LayerParams)
    local nFrameId = EgtGetFirstNameInGroup( s_nPartId, LAY_FRAME)
    EgtMove( nFrameId, - vtMove, GDB_RT.GLOB)
    
-end
-
-------------------------------------------------------------------
-local function FindWipeEndPoint( ptS, vtDir, dLen, vtSlicing)
-   
-   local ptE = ptS + vtDir * dLen
-   -- verifico soddisfi altezza minima per non entrare nella tavola
-   local k = 1
-   while ptE:getZ() < s_dHMin + GEO.EPS_SMALL and k < 36 do
-      vtDir:rotate( vtSlicing, 10)
-      ptE = ptS + vtDir * dLen
-      k = k + 1
+   -- correzione per i wipe
+   -- altezza minima necessaria per i wipe
+   local dHMinWipe = LayerParams.dTDiam / 2 * dNxy + max( dHBox, 0) + s_dHSafeWipe
+   local vLayIds = EgtGetNameInGroup( s_nPartId, SLICE_LAYER.."*")
+   for i = 1, #vLayIds do
+      local vCrvGrps = EgtGetNameInGroup( vLayIds[i], CONTOUR_GRP.."*")
+      for j = 1, #vCrvGrps do
+         local nTPath = EgtGetFirstNameInGroup( vCrvGrps[j], TOOLPATH_GRP)
+         if nTPath then
+            local vIds = EgtGetAllInGroup( nTPath)
+            for k = 1, #vIds do
+               -- se wipe verifico se ha lunghezza sensata per non finire nella tavola
+               if EgtGetInfo( vIds[k], KEY_TYPE, 'i') == TYPE.WIPE then
+                  -- da controllare solo se non segue l'andamento di una curva chiusa
+                  local bOnCurve = EgtGetInfo( vIds[k], KEY_WIPE_ON_CRV, 'b') or false
+                  if not bOnCurve then
+                     local dLen = EgtCurveLength( vIds[k])
+                     local vtDir = EgtSV( vIds[k], GDB_ID.ROOT)
+                     local ptE = EgtEP( vIds[k], GDB_ID.ROOT)
+                     if ptE:getZ() < dHMinWipe then
+                        -- modifico la lunghezza per non finire nella tavola
+                        local dDiffLen = abs( ( dHMinWipe - ptE:getZ()) / vtDir:getZ())
+                        if dDiffLen > dLen - GEO.EPS_SMALL then
+                           -- l'intero tratto di wipe va eliminato
+                           EgtErase( vIds[k])
+                           EgtOutLog( 'Warning : wipe was removed due to wrong direction (layer '..tostring( i)..') - CalcToolPath')
+                        else
+                           EgtTrimCurveEndAtLen( vIds[k], dLen - dDiffLen)
+                        end
+                     end
+                  end
+               end
+            end
+         end
+      end
    end
-   
-   return ptE
 end
 
 -------------------------------------------------------------------
@@ -131,7 +154,7 @@ local function AddCurvesToToolPath( vEntIds, nTpathGrpId, nOrder, bInvert, vtSli
       
       -- mi sposto dell'altezza layer
       EgtMove( vIds[nIdx], dLayHeight * vtSlicing, GDB_RT.GLOB)
-      
+     
       if EgtCurveIsClosed( vIds[nIdx]) then
          EgtSetInfo( vIds[nIdx], KEY_CLOSED_CRV, 1)
          -- eventuale inversione
@@ -140,6 +163,13 @@ local function AddCurvesToToolPath( vEntIds, nTpathGrpId, nOrder, bInvert, vtSli
             EgtSetInfo( vIds[nIdx], KEY_INVERTED_CRV, 1)
          end
       end
+      
+      -- approssimo la curva e ne risetto il punto iniziale
+      local ptS = EgtSP( vIds[nIdx], GDB_ID.ROOT)
+      EgtApproxCurve( vIds[nIdx], GDB_CA.ARCS, s_dApproxTol)
+      if EgtCurveIsClosed( vIds[nIdx]) then
+         EgtChangeClosedCurveStartPoint( vIds[nIdx], ptS, GDB_RT.GLOB)
+      end
 
       EgtSetInfo( vEntIds[i], KEY_ASSOCIATED_TP_CRV, vIds[nIdx])
       EgtSetInfo( vIds[nIdx], KEY_ASSOCIATED_P_CRV, vEntIds[i])
@@ -297,8 +327,6 @@ local function AddLeadIn( nCrvId, LayerParams, nGrpId)
 
    vtOrtho:rotate( LayerParams.vtSlicing, dAng)
    local ptS = ptE - LayerParams.dLeadInTangDist * vtTang + LayerParams.dLeadInOrthoDist * vtOrtho
-   -- verifico che non affondi nella tavola
-   if ptS:getZ() < s_dHMin + GEO.EPS_SMALL then return end
 
    local nLeadInCrv
    if LayerParams.nLeadInType == LEAD_TYPE.LINEAR then
@@ -358,22 +386,33 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
    local nType = EgtGetInfo( nCrvId, KEY_TYPE, 'i')
    local bClosed = EgtGetInfo( nCrvId, KEY_CLOSED_CRV, 'b') or false
    local bInverted = EgtGetInfo( nCrvId, KEY_INVERTED_CRV, 'b') or false
-
+   local dStrand = EgtGetInfo( nCrvId, KEY_CRV_STRAND, 'd')
+   
    -- curva ausiliaria per generare correttamente wipe
    local nCopyId = EgtCopyGlob( nCrvId, nCrvId, GDB_IN.AFTER)
-   if not EgtCurveIsClosed( nCopyId) then
-      local ptNewStart = EgtEP( nCrvId)
-      local dPar = EgtCurveParamAtPoint( nCopyId, ptNewStart)
-      local _, dParE = EgtCurveDomain( nCopyId)
-      if abs( dPar - dParE) < GEO.EPS_SMALL then
-         EgtCloseCurveCompo( nCopyId)
-         EgtChangeClosedCurveStartPoint( nCopyId, ptNewStart)
-      else
+   if not EgtCurveIsClosed( nCopyId) and EgtCurveIsFlat( nCopyId) then
+      local ptNewStart = EgtEP( nCopyId, GDB_ID.ROOT)
+      -- mi posiziono in un frame locale per fare i conti
+      local nGrp = EgtGroup( EgtGetParent( nCrvId), Frame3d( ORIG(), vtSlicing), GDB_RT.GLOB)
+      EgtRelocateGlob( nCopyId, nGrp)
+      local nInters = EgtCurveSelfIntersCount( nCopyId)
+      local nCrvCnt
+      if nInters > 0 then
          -- caso con sovrapposizione
-         EgtTrimCurveStartAtParam( nCopyId, dPar)
+         nCopyId, nCrvCnt = EgtSplitCurveAtSelfInters( nCopyId)
+         for nIdx = 1, nCrvCnt - 2 do
+            EgtAddCurveCompoCurve( nCopyId, nCopyId + nIdx)
+         end
+         if nCrvCnt > 1 then 
+            EgtErase( nCopyId + nCrvCnt - 1)
+         end
       end
+      EgtCloseCurveCompo( nCopyId)
+      EgtChangeClosedCurveStartPoint( nCopyId, ptNewStart, GDB_RT.GLOB)
+      EgtRelocateGlob( nCopyId, nCrvId, GDB_IN.AFTER)
+      EgtErase( nGrp)
    end
-   
+
    local nCoastingId
    if dCoastingLen > GEO.EPS_SMALL then
       nCoastingId = EgtCopyGlob( nCrvId, nCrvId, GDB_IN.AFTER)
@@ -404,6 +443,7 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
          nWipeId = nCopyId
          nCopyId = nil
          EgtTrimCurveEndAtLen( nWipeId, dWipeLen)
+         EgtSetInfo( nWipeId, KEY_WIPE_ON_CRV, true)
       else
          -- se extra shell, infill, spiral vase o rib che non termina sulla parete
          local ptS = EgtEP( nCoastingId or nCrvId, GDB_ID.ROOT)
@@ -451,7 +491,7 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
          end
          
          vtDir:rotate( vtSlicing, EgtIf( bChangeSign, - dAng, dAng))
-         local ptE = FindWipeEndPoint( ptS, vtDir, dWipeLen, vtSlicing)
+         local ptE = ptS + vtDir * dWipeLen
          nWipeId = EgtCurveCompoFromPoints( EgtGetParent( nCoastingId or nCrvId), {ptS, ptE}, GDB_RT.GLOB)
          EgtModifyCurveExtrusion( nWipeId, vtSlicing, GDB_RT.GLOB)
          EgtRelocateGlob( nWipeId, nCoastingId or nCrvId, GDB_IN.AFTER)
@@ -460,7 +500,7 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
       if nWipeId then
          EgtSetName( nWipeId, WIPE_CRV)
          EgtSetInfo( nWipeId, KEY_TYPE, TYPE.WIPE)
-         EgtSetInfo( nWipeId, KEY_CRV_STRAND, 0)
+         EgtSetInfo( nWipeId, KEY_CRV_STRAND, dStrand)
          EgtSetColor( nWipeId, EgtStdColor('AQUA'))
       end
    end
@@ -501,7 +541,7 @@ local function CalcShellsToolPath( vEntIds, nTpathGrpId, LayerParams)
    -- aggiungo le curve nel toolpath
    local vIds = AddCurvesToToolPath( vEntIds, nTpathGrpId, LayerParams.nOrder, LayerParams.bInvert, LayerParams.vtSlicing, LayerParams.dLayHeight)
    local nFirstCopy = EgtCopyGlob( vIds[1], nTpathGrpId)   -- necessaria per corretto offset lead point sulla shell esterna
-   
+
    -- assegno lo strand
    for i = 1, #vIds do
       local nType = EgtGetInfo( vIds[i], KEY_TYPE, 'i')
@@ -513,7 +553,7 @@ local function CalcShellsToolPath( vEntIds, nTpathGrpId, LayerParams)
          EgtSetInfo( vIds[i], KEY_CRV_STRAND, LayerParams.dInfillStrand)
       end
    end
-   
+
    -- aggiungo gli opportuni raccordi
    AddLink( vIds, nTpathGrpId, LayerParams.nLinkType, LayerParams.dLinkParam, LayerParams.dSPOffs, LayerParams.nOrder, LayerParams.vtSlicing)
    
@@ -1024,45 +1064,128 @@ end
 --------------------------------------------------------------------
 --------------------------- RIBS -----------------------------------
 --------------------------------------------------------------------
-local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+local function AddFillet( nCrv1, nCrv2, dFillet, vtSlicing)
+   
+   if dFillet < GEO.EPS_SMALL then
+      return
+   end
+   
+   local nRefPosId = EgtGetPrev( nCrv1)
+   local nRefGrpId = EgtGetParent( nCrv1)
+   local vsInfo1 = EgtGetAllInfo( nCrv1)
+   local vsInfo2 = EgtGetAllInfo( nCrv2)
+   
+   -- creo un gruppo con riferimento locale allo slicing per i conti del fillet
+   local nGrpTmp = EgtGroup( EgtGetParent( nCrv1), Frame3d( ORIG(), vtSlicing), GDB_RT.GLOB)
+   
+   -- creo il fillet
+   local dParRef1 = EgtCurveParamAtLength( nCrv1, EgtCurveLength( nCrv1) - 100 * GEO.EPS_SMALL)
+   local dParRef2 = EgtCurveParamAtLength( nCrv2, 100 * GEO.EPS_SMALL)
+   local nFillet = EgtCurveFillet( nGrpTmp, nCrv1, EgtUP( nCrv1, dParRef1, nGrpTmp), nCrv2, EgtUP( nCrv2, dParRef2, nGrpTmp), dFillet, true, GDB_RT.LOC)
+   if not nFillet then
+      -- ritento con valore di fillet leggermente inferiore
+      nFillet = EgtCurveFillet( nGrpTmp, nCrv1, EgtUP( nCrv1, dParRef1, nGrpTmp), nCrv2, EgtUP( nCrv2, dParRef2, nGrpTmp), dFillet - 50 * GEO.EPS_SMALL, true, GDB_RT.LOC)
+   end
+
+   -- spezzo a metà il fillet per assegnarlo alle due curve
+   if nFillet then
+      
+      local nNewFillet = EgtSplitCurve( nFillet, 2)
+      
+      -- aggiungo a nCrv1
+      if EgtExistsObj( nCrv1) then
+         EgtAddCurveCompoArcTg( nCrv1, EgtEP( nNewFillet, GDB_ID.ROOT), true, GDB_RT.GLOB)
+         EgtErase( nNewFillet)
+      else
+         -- nCrv1 viene sostituita completamente dal fillet
+         local nNewCrv = EgtCurveCompo( nRefGrpId, {nNewFillet})
+         -- riposiziono dopo il precedente di nCrv1 ( se esiste) oppure in testa al gruppo
+         if nRefPosId ~= GDB_ID.NULL then
+            EgtRelocateGlob( nNewFillet, nRefPosId, GDB_IN.AFTER)
+         else
+            EgtRelocateGlob( nNewFillet, nRefGrpId, GDB_IN.FIRST_SON)
+         end
+         -- modifico l'id per conservare quello di nCrv1
+         EgtChangeId( nNewCrv, nCrv1)
+         -- riassegno le info
+         for i = 1, #vsInfo1 do
+            local vsInfo = EgtSplitString( vsInfo1[i], '=')
+            EgtSetInfo( nCrv1, vsInfo[1], vsInfo[2])
+         end
+      end
+      
+      -- aggiungo a nCrv2
+      if EgtExistsObj( nCrv2) then
+         EgtAddCurveCompoArcTg( nCrv2, EgtSP( nNewFillet + 1, GDB_ID.ROOT), false, GDB_RT.GLOB)
+         EgtErase( nNewFillet + 1)
+      else
+         -- nCrv2 viene sostituita completamente dal fillet
+         local nNewCrv = EgtCurveCompo( nRefGrpId, {nNewFillet + 1})
+         EgtRelocateGlob( nNewCrv, nCrv1, GDB_IN.AFTER)
+         EgtChangeId( nNewCrv, nCrv2)
+         for i = 1, #vsInfo2 do
+            local vsInfo = EgtSplitString( vsInfo2[i], '=')
+            EgtSetInfo( nCrv2, vsInfo[1], vsInfo[2])
+         end
+      end
+   else
+      EgtOutLog( 'Warning : ribs fillet not possible (layer '..tostring( s_nCurrIdx)..') - CalcToolPath')
+   end
+   
+   EgtErase( nGrpTmp)
+end
+
+--------------------------------------------------------------------
+local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
 
    local dOverlap1 = EgtGetInfo( nCurr, KEY_RIBS_OVERLAP, 'd')
    local dOverlap2 = EgtGetInfo( nNext, KEY_RIBS_OVERLAP, 'd')
    local dOverlap = max( dOverlap1, dOverlap2)
    local dLen = EgtCurveLength( nLinkId)
    
-   -- verifico che non entri nella tavola
+   -- 1) verifico che non entri nella tavola
    local b3Box = EgtGetBBoxGlob( nLinkId, GDB_BB.STANDARD)
    if b3Box:getMin():getZ() < - GEO.EPS_SMALL then
       return false
    end
    
-   -- eventuale verifica con setti coinvolti dal link
-   -- verifico non passi per estremo errato
+   -- 2) verifica con setti coinvolti dal link
    if nCurr ~= nNext then
+      -- verifico non passi per estremo errato
       local dParTest1 = EgtCurveParamAtPoint( nLinkId, EgtSP( nCurr, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
       local dParTest2 = EgtCurveParamAtPoint( nLinkId, EgtEP( nNext, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
       if dParTest1 or dParTest2 then
          return false
       end
-   end
-
-   if bCheckLinked and dLen > 3 * dStrand then
-      -- regione occupata dai setti
-      local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL
-      local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL
-      EgtSurfFrAdd( nSrfRibs, nSrfRibs2)
-      -- verifico che i tratti fuori abbiano lunghezza maggiore di quelli dentro
+      
+      -- verifico non intersechi i setti in altri punti oltre agli estremi
+      local nCurrLoc = EgtCopyGlob( nCurr, nGrpTmp)
+      local nNextLoc = EgtCopyGlob( nNext, nGrpTmp)
       local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
-      local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false)
-      if nCnt == 0 then return false end
-      local dResLen = EgtCurveLength( nRes)
-      if dResLen < ( dLen - dResLen) - GEO.EPS_SMALL then
+      EgtTrimCurveEndAtLen( nLinkLoc, EgtCurveLength( nLinkLoc) - 100 * GEO.EPS_SMALL)
+      EgtTrimCurveStartAtLen( nLinkLoc, 100 * GEO.EPS_SMALL)
+      if EgtIP( nLinkLoc, nCurrLoc, ORIG()) or EgtIP( nLinkLoc, nNextLoc, ORIG()) then
          return false
       end
+      
+      -- se collegamento non ottimale verifico che abbia una parte esterna alla regione occupata dai setti abbsatanza lunga ( > 20% della lunghezza totale)
+      if dist( EgtEP( nCurr, GDB_ID.ROOT), EgtSP( nNext, GDB_ID.ROOT)) > dist( EgtEP( nCurr, GDB_ID.ROOT), EgtEP( nNext, GDB_ID.ROOT)) + 1000 * GEO.EPS_SMALL then
+         local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL
+         local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL
+         EgtSurfFrAdd( nSrfRibs, nSrfRibs2)
+         -- EgtSetStatus( nSrfRibs, GDB_ST.OFF)
+         -- EgtSetStatus( nSrfRibs2, GDB_ST.OFF)
+         local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
+         local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false)
+         if nCnt == 0 then return false end
+         local dResLen = EgtCurveLength( nRes)
+         if dResLen < 0.2 * dLen - GEO.EPS_SMALL then
+            return false
+         end
+      end
    end
    
-   -- verifico se interseca altri setti ( considerando anche le tipologie del PathGrp non ancora realizzate)
+   -- 3) verifiche con altri setti ( considerando anche le tipologie del PathGrp non ancora realizzate)
    local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
    local nOrigCurr = EgtGetInfo( nCurr, KEY_ORIGINAL_RIB, 'i')
    local nOrigNext = EgtGetInfo( nNext, KEY_ORIGINAL_RIB, 'i')
@@ -1079,39 +1202,39 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLi
    
    for i = 1, #vRibsIds do
       if vRibsIds[i] ~= nCurr and vRibsIds[i] ~= nNext then
+         -- verifico se sovrapposizione tra le passate
          local dCurrStrand = EgtGetInfo( vRibsIds[i], KEY_RIBS_STRAND, 'd')
          local nOrigId = EgtGetInfo( vRibsIds[i], KEY_ORIGINAL_RIB, 'i')
+         local dOffs
          if nOrigId == nOrigCurr or nOrigId == nOrigNext then
-            -- se passate relative ad un setto coinvolto verifico se sovrapposizione con la curva
-            local ptS = EgtSP( vRibsIds[i], GDB_ID.ROOT)
-            local dParS = EgtCurveParamAtPoint( nLinkLoc, ptS, dCurrStrand * 0.5, GDB_RT.GLOB)
-            if dParS then return false end
-            local ptE = EgtEP( vRibsIds[i], GDB_ID.ROOT)
-            local dParE = EgtCurveParamAtPoint( nLinkLoc, ptE, dCurrStrand * 0.5, GDB_RT.GLOB)
-            if dParE then return false end
+            -- se passata relativa ad un setto coinvolto nel link verifico soltanto che il percorso del link non entri nella regione occupata dal setto
+            dOffs = dCurrStrand * 0.5
          else
-            -- verifico se sovrapposizione con la passata
-            local dOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 10 * GEO.EPS_SMALL
-            if dOffs > GEO.EPS_SMALL then
-               local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vRibsIds[i], dOffs, false)
-               if nSrfCurr then
-                  local nRes = EgtCurveWithRegionClassify( nLinkLoc, nSrfCurr)
-                  if nRes ~= GDB_CRC.OUT then
-                     return false
-                  end
+            -- altrimenti verifico che le regioni del link e del setto non si sovrappongono ( a meno dell'overlap fissato)
+            dOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 50 * GEO.EPS_SMALL
+         end
+         
+         if dOffs > GEO.EPS_SMALL then
+            local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vRibsIds[i], dOffs, false)
+            if nSrfCurr then
+               -- EgtSetStatus( nSrfCurr, GDB_ST.OFF)
+               local nRes = EgtCurveWithRegionClassify( nLinkLoc, nSrfCurr)
+               if nRes ~= GDB_CRC.OUT then
+                  return false
                end
             end
          end
       end
    end
    
-   -- verifico se si trova almeno in una regione ammissibile ( per caso ForcedLink)
+   -- 4) verifico se si trova in almeno una regione ammissibile ( per caso ForcedLink)
    local nType = EgtGetInfo( nCurr, KEY_RIBS_TYPE, 'i')
    local nOut = 0
    for i = 1, 2 do
       local nSurfId = EgtGetInfo( EgtIf( i == 1, nCurr, nNext), KEY_ASSOCIATED_SURF, 'i')
       if nSurfId and nSurfId ~= -1 then
          local nSrfLoc = EgtCopyGlob( nSurfId, nGrpTmp)
+         -- EgtSetStatus( nSrfLoc, GDB_ST.OFF)
          local nRes = EgtCurveWithRegionClassify( nLinkId, nSrfLoc)
          if ( ( nType == RIB_TYPE.INTERNAL or nType == RIB_TYPE.SUPPORT) and ( nRes == GDB_CRC.OUT or nRes == GDB_CRC.INTERS)) or 
             ( nType == RIB_TYPE.EXTERNAL and ( nRes == GDB_CRC.IN or nRes == GDB_CRC.INTERS)) then
@@ -1133,31 +1256,37 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLi
 end
 
 --------------------------------------------------------------------
-local function ComputeRibsLinkOnSameCrv( nCrvId, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+local function ComputeRibsLinkOnSameCrv( nCrvId, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand)
    
    local nParentId = EgtGetParent( nCrvId)
+
+   local nShortest = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
+   local nLongest = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
+   EgtTrimCurveStartEndAtParam( nShortest, dParS, dParE)
+   EgtTrimCurveStartEndAtParam( nLongest, dParE, dParS)
+   EgtInvertCurve( nLongest)
+   if EgtCurveLength( nShortest) > EgtCurveLength( nLongest) + GEO.EPS_SMALL then
+      nShortest, nLongest = nLongest, nShortest
+   end
    
-   -- verifico il percorso dParS->dParE
-   local nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
-   EgtTrimCurveStartEndAtParam( nCopyId, dParS, dParE)
-   if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
-      return nCopyId
+   -- verifico il percorso più corto
+   if VerifyRibsLink( nShortest, nCurr, nNext, nGrpTmp, dStrand) then
+      EgtErase( nLongest)
+      return nShortest
    else
-      -- se non valido tento con il percorso dParE->dParS
-      EgtErase( nCopyId)
-      nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
-      EgtTrimCurveStartEndAtParam( nCopyId, dParE, dParS)
-      EgtInvertCurve( nCopyId)
-      if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
-         return nCopyId
+      -- se non valido tento con il percorso più lungo
+      EgtErase( nShortest)
+      if VerifyRibsLink( nLongest, nCurr, nNext, nGrpTmp, dStrand) then
+         return nLongest
       else
+         EgtErase( nLongest)
          return
       end
    end
 end
 
 --------------------------------------------------------------------
-local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand)
    
    local nParentId = EgtGetParent( nCrvS)
    
@@ -1175,7 +1304,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
    EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1)
    EgtErase( nCrv1)
    -- verifico se valida
-   if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
+   if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand) then
       return nCrv2
       
    else
@@ -1189,7 +1318,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
       EgtInvertCurve( nCrv2)
       EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1) -- transizione uniforme da nCrv1
       EgtErase( nCrv1)
-      if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
+      if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand) then
          return nCrv2
       else
          EgtErase( nCrv2)
@@ -1199,7 +1328,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
 end
 
 --------------------------------------------------------------------
-local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, vtSlicing, nGrpTmp)
+local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrpTmp)
    
    local ptS = EgtEP( nCurr)
    local ptE = EgtSP( nNext)
@@ -1208,6 +1337,8 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
    local dStrand1 = EgtGetInfo( nCurr, KEY_CRV_STRAND, 'd')
    local dStrand2 = EgtGetInfo( nNext, KEY_CRV_STRAND, 'd')
    local dStrand = max( dStrand1, dStrand2)
+   local dFillet1 = EgtGetInfo( nCurr, KEY_RIBS_LINK_FILLET, 'd')
+   local dFillet2 = EgtGetInfo( nNext, KEY_RIBS_LINK_FILLET, 'd')
    
    local vCrvIds = EgtGetAllInGroup( nLoopGrp)
    -- recupero le curve di bordo su cui poggiano i setti e i corrispondenti parametri
@@ -1232,13 +1363,21 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
          local nLinkId
          if vIdsS[i] == vIdsE[j] then
             -- link su una sola curva
-            nLinkId = ComputeRibsLinkOnSameCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+            nLinkId = ComputeRibsLinkOnSameCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand)
          else
             -- link tra due curve distinte
-            nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+            nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand)
          end
          
          if nLinkId then
+            -- fillet
+            if bForceLink then
+               dFillet1 = min( dFillet1, dStrand1 * 0.5)
+               dFillet2 = min( dFillet2, dStrand2 * 0.5)
+            end
+            AddFillet( nCurr, nLinkId, dFillet1, vtSlicing)
+            AddFillet( nLinkId, nNext, dFillet2, vtSlicing)
+            -- assegno le info
             EgtRelocateGlob( nLinkId, nCurr, GDB_IN.AFTER)
             EgtSetInfo( nLinkId, KEY_TYPE, TYPE.RIB)
             EgtSetName( nLinkId, LINK_CRV)
@@ -1252,13 +1391,19 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
    -- se non ho trovato un collegamento lungo bordi ma link deve esserci creo una linea tra ptS e ptE
    if bForceLink then
       local nLinkId = EgtCurveCompoFromPoints( EgtGetParent( nCurr), {ptS, ptE})
+      -- assegno le info
       EgtSetInfo( nLinkId, KEY_TYPE, TYPE.RIB)
       EgtSetName( nLinkId, LINK_CRV)
       EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB)
       EgtRelocateGlob( nLinkId, nCurr, GDB_IN.AFTER)
       EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
-      local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
+      local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
       if bValid then
+         -- fillet
+         dFillet1 = min( dFillet1, dStrand1 * 0.5)
+         dFillet2 = min( dFillet2, dStrand2 * 0.5)
+         AddFillet( nCurr, nLinkId, dFillet1, vtSlicing)
+         AddFillet( nLinkId, nNext, dFillet2, vtSlicing)
          return nLinkId
       else
          EgtErase( nLinkId)
@@ -1270,12 +1415,13 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
 end
 
 --------------------------------------------------------------------
-local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp)
+local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp, bForceLink)
    
    local ptS = EgtEP( nCurr)
    local ptE = EgtSP( nNext)
    if AreSamePointApprox( ptS, ptE) then return end
    local dStrand = EgtGetInfo( nCurr, KEY_CRV_STRAND, 'd')
+   local dFillet = EgtGetInfo( nCurr, KEY_RIBS_LINK_FILLET, 'd')
    
    local vCrvIds = EgtGetAllInGroup( nLoopGrp)
    -- scorro le curve di bordo e verifico se posso creare il link
@@ -1290,7 +1436,13 @@ local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp)
             EgtSetName( nLinkId, LINK_CRV)
             EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB)
             EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
-            if VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, false) then
+            if VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand) then
+               -- fillet
+               if bForceLink then
+                  dFillet = min( dFillet, dStrand * 0.5)
+               end
+               AddFillet( nCurr, nLinkId, dFillet, vtSlicing)
+               AddFillet( nLinkId, nNext, dFillet, vtSlicing)
                return nLinkId
             else
                EgtErase( nLinkId)
@@ -1314,7 +1466,19 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
    -- individuo eventuale lead in o link relativo al setto corrente ( solo se collega due passate dello stesso setto)
    local nCurrLI
    local nCurrLink
-   if not bInVsOut then
+   if bInVsOut then
+      -- se è lead in devo solo verificare se seguito da un link
+      local nNext = EgtGetNext( nRibId)
+      if nNext and EgtGetName( nNext) == LINK_CRV then
+         local nNextRib = EgtGetNext( nNext)
+         local nOrigRib = EgtGetInfo( nRibId, KEY_ORIGINAL_RIB, 'i') or -1
+         local nOrigRibPrev = EgtGetInfo( nNextRib, KEY_ORIGINAL_RIB, 'i') or -1
+         if nOrigRib == nOrigRibPrev then
+            nCurrLink = nNext
+         end
+      end
+   else
+      -- se è lead out devo verificare se preceduto da lead in o da link
       local nPrev = EgtGetPrev( nRibId)
       if nPrev and EgtGetName( nPrev) == LEAD_IN_CRV then
          nCurrLI = nPrev
@@ -1328,17 +1492,18 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
       end
    end
    
-   -- verifico se interseca altri setti, lead in, lead out o collegamenti
+   -- 1) verifico se interseca altri setti, lead in, lead out o collegamenti
    -- recupero gli id degli elementi da controllare
    local vCheckIds = {}
-   local nCurrId = EgtGetFirstNameInGroup( EgtGetParent( nRibId), RIBS_CRV .. '*')
-   -- verifico se il primo setto ha lead in da controllare
-   local nPrevId = EgtGetPrev( nCurrId)
-   if nPrevId and EgtGetName( nPrevId) == LEAD_IN_CRV then nCurrId = nPrevId end
+   local nCurrId = EgtGetFirstInGroup( EgtGetParent( nRibId))
    while nCurrId do
-      -- salto i i wipe ( non sono materiale depositato) e i tratti relativi al setto corrente
-      if not EgtStartsWith( EgtGetName( nCurrId), WIPE_CRV) and nCurrId ~= nCurrLI and nCurrId ~= nRibId and nCurrId ~= nId and nCurrId ~= nCurrLink then
-         table.insert( vCheckIds, nCurrId)
+      -- considero solo i setti e gli elementi a loro associati ( tranne i wipe perchè non corrispondono a materiale depositato)
+      local nType = EgtGetInfo( nCurrId, KEY_TYPE, 'i')
+      if nType == TYPE.RIB or ( nType == TYPE.COASTING and EgtGetInfo( EgtGetPrev( nCurrId), KEY_TYPE, 'i') == TYPE.RIB) then
+         -- verifico non sia un tratto relativo al setto corrente
+         if nCurrId ~= nCurrLI and nCurrId ~= nRibId and nCurrId ~= nId and nCurrId ~= nCurrLink then
+            table.insert( vCheckIds, nCurrId)
+         end
       end
       nCurrId = EgtGetNext( nCurrId)
    end
@@ -1355,10 +1520,11 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
    -- controllo se intersezione
    for i = 1, #vCheckIds do
       local dCurrStrand = EgtGetInfo( vCheckIds[i], KEY_CRV_STRAND, 'd') or EgtGetInfo( vCheckIds[i], KEY_RIBS_STRAND, 'd')
-      local dCurrOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 10 * GEO.EPS_SMALL
+      local dCurrOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 50 * GEO.EPS_SMALL
       if dCurrOffs > GEO.EPS_SMALL then
          local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vCheckIds[i], dCurrOffs, false)
          if nSrfCurr then
+            -- EgtSetStatus( nSrfCurr, GDB_ST.OFF)
             local nRes = EgtCurveWithRegionClassify( nLeadLoc, nSrfCurr)
             if nRes ~= GDB_CRC.OUT then
                return false
@@ -1367,7 +1533,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
       end
    end
   
-   -- verifiche con il setto corrente
+   -- 2) verifiche con il setto corrente
    -- verifico non passi da altro estremo
    local dParTest = EgtCurveParamAtPoint( nLeadLoc, EgtIf( bInVsOut, EgtEP( nRibId, GDB_ID.ROOT), EgtSP( nRibId, GDB_ID.ROOT)), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
    if dParTest then
@@ -1378,12 +1544,11 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
    local nRibLoc = EgtCopyGlob( nRibId, nGrpTmp)
    local vtDir = EgtMV( nRibLoc)
    local dParCrv = 1
-   local dTol = 10 * GEO.EPS_SMALL
    for dParCrv = 1, dParE do
       local vtS = EgtUV( nLeadLoc, dParCrv - 1, 1)
       local vtE = EgtUV( nLeadLoc, dParCrv, -1)
-      local dTol = 10 * GEO.EPS_SMALL
-      if AreSameVectorApprox( vtS, vtE) and vtS * vtDir < - 1 + GEO.EPS_SMALL then
+      local dLenCrv = EgtCurveCompoLength( nLeadLoc, dParCrv - 1)
+      if AreSameVectorApprox( vtS, vtE) and vtS * vtDir < - 1 + GEO.EPS_SMALL and dLenCrv > dStrand + GEO.EPS_SMALL then
          local dDist = EgtPointCurveDist( EgtUP( nLeadLoc, dParCrv - 0.5), nRibLoc)
          EgtCopyGlob( nLeadLoc, nGrpTmp)
          if dDist < dStrand + GEO.EPS_SMALL then
@@ -1392,7 +1557,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
       end
    end
    
-   -- verifiche con eventuale lead in
+   -- 3) verifiche con eventuale lead in
    if nCurrLI then
       local nLeadInLoc = EgtCopyGlob( nCurrLI, nGrpTmp)
       -- verifico se intersezione fra curve
@@ -1404,6 +1569,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
       if dLeadInLen > dStrand + GEO.EPS_SMALL then
          local nSrfLeadIn = EgtSurfFrFatCurve( nGrpTmp, nId, dStrand * ( 1 - dOverlap / 100), false)
          if nSrfLeadIn then
+            -- EgtSetStatus( nSrfLeadIn, GDB_ST.OFF)
             -- verifico di avere un solo tratto esterno di lunghezza sufficiente
             local nRes, nCnt = EgtTrimCurveWithRegion( nLeadInLoc, nSrfLeadIn, false, false)
             if nCnt ~= 1 then
@@ -1464,7 +1630,9 @@ local function FindCorrectRibLead( dPar, nRib, nCrvOffs, bLeadInvert, dLeadLen,
          nOtherRib = EgtIf( bInVsOut, EgtGetNext( nLinkId), EgtGetPrev( nLinkId))
          local nOrigRib1 = EgtGetInfo( nRib, KEY_ORIGINAL_RIB, 'i')
          local nOrigRib2 = EgtGetInfo( nOtherRib, KEY_ORIGINAL_RIB, 'i')
-         if nOrigRib1 ~= nOrigRib2 then
+         local nSplitId1 = EgtGetInfo( nRib, KEY_SPLIT_ID, 'i') or 0
+         local nSplitId2 = EgtGetInfo( nOtherRib, KEY_SPLIT_ID, 'i') or 0
+         if nOrigRib1 ~= nOrigRib2 or ( nOrigRib1 == nOrigRib2 and nSplitId1 ~= nSplitId2) then
             nOtherRib = nil
          end
       end
@@ -1521,6 +1689,7 @@ local function AddRibsLeadIn( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSolid
    local dLILen = EgtGetInfo( nCrv, KEY_RIBS_LEAD_IN_LEN, 'd')
    local bLIInvert = EgtGetInfo( nCrv, KEY_RIBS_LEAD_IN_INVERT, 'b')
    local dStrand = EgtGetInfo( nCrv, KEY_CRV_STRAND, 'd')
+   local dFillet = EgtGetInfo( nCrv, KEY_RIBS_LEAD_FILLET, 'd')
    
    if dLILen < GEO.EPS_SMALL then return end
    
@@ -1534,11 +1703,13 @@ local function AddRibsLeadIn( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSolid
    end
    
    for i = 1, #vCrvOffs do
-      local dParS = EgtCurveParamAtPoint( vCrvOffs[i], ptS)
+      local dParS = EgtCurveParamAtPoint( vCrvOffs[i], ptS, 100 * GEO.EPS_SMALL)
       if dParS then
          local nLeadIn = FindCorrectRibLead( dParS, nCrv, vCrvOffs[i], bLIInvert, dLILen, true, nGrpTmp, bSpecialCase)
          -- se lead in possibile
          if nLeadIn then
+            AddFillet( nLeadIn, nCrv, dFillet, vtSlicing)
+            
             EgtModifyCurveExtrusion( nLeadIn, vtSlicing, GDB_RT.GLOB)
             EgtSetInfo( nLeadIn, KEY_TYPE, TYPE.RIB)
             EgtSetName( nLeadIn, LEAD_IN_CRV)
@@ -1558,6 +1729,7 @@ local function AddRibsLeadOut( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSoli
    local dRibsLOWipeAng = EgtGetInfo( nCrv, KEY_RIBS_LEAD_OUT_WIPE_DIR, 'd')
    local bRibsLOInvert = EgtGetInfo( nCrv, KEY_RIBS_LEAD_OUT_INVERT, 'b')
    local dStrand = EgtGetInfo( nCrv, KEY_CRV_STRAND, 'd')
+   local dFillet = EgtGetInfo( nCrv, KEY_RIBS_LEAD_FILLET, 'd')
    
    if abs( dRibsLOLen) < GEO.EPS_SMALL and
       abs( dRibsLOCoasting) < GEO.EPS_SMALL and
@@ -1591,7 +1763,12 @@ local function AddRibsLeadOut( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSoli
          local nCrvRef, bInvert = FindCorrectRibLead( dParE, nCrv, vCrvOffs[i], bRibsLOInvert, dRibsLOLen + dRibsLOCoasting, false, nGrpTmp, bSpecialCase)
    
          if nCrvRef then
-   
+            
+            -- aggiungo il fillet ( potrebbe coinvolgere sia lead out sia coasting)
+            AddFillet( nCrv, nCrvRef, dFillet, vtSlicing)
+            -- calcolo la nuova lunghezza per il lead out per conservare la lunghezza del coasting dopo il fillet
+            dRibsLOLen = EgtCurveLength( nCrvRef) - dRibsLOCoasting
+            
             -- primo tratto ( segue offset con flusso aperto)
             if dRibsLOLen > GEO.EPS_SMALL then
                nCrvLO = EgtCopyGlob( nCrvRef, nCrv, GDB_IN.AFTER)
@@ -1629,14 +1806,14 @@ local function AddRibsLeadOut( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSoli
                local nType = EgtGetInfo( nCrv, KEY_RIBS_TYPE, 'i')
                if nType == RIB_TYPE.EXTERNAL then dAng = - dAng end
                vtE:rotate( vtSlicing, EgtIf( bInvert, - dAng, dAng))
-               local ptFinal = FindWipeEndPoint( ptE, vtE, dRibsLOWipe, vtSlicing)
+               local ptFinal = ptE + vtE * dRibsLOWipe
                nWipe = EgtCurveCompoFromPoints( EgtGetParent( nCrv), { ptE, ptFinal}, GDB_RT.GLOB)
                if nWipe then
                   EgtModifyCurveExtrusion( nWipe, vtSlicing, GDB_RT.GLOB)
                   EgtRelocateGlob( nWipe, nCoasting or nCrvLO or nCrv, GDB_IN.AFTER)
                   EgtSetName( nWipe, WIPE_CRV)
                   EgtSetInfo( nWipe, KEY_TYPE, TYPE.WIPE)
-                  EgtSetInfo( nWipe, KEY_CRV_STRAND, 0)
+                  EgtSetInfo( nWipe, KEY_CRV_STRAND, dStrand)
                   EgtSetColor( nWipe, EgtStdColor('AQUA'))
                end
             end
@@ -1661,12 +1838,20 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
    local nGrpTmp = EgtGroup( nRibsGrp, frLoc, GDB_RT.GLOB)
    
    -- aggiungo le costolature nel toolpath
-   local nNewFirstEnt
+   local nLastEnt = EgtGetLastInGroup( nTpathGrpId)
    for i = 1, #vEntIds do
       -- copio entità nel gruppo toolpath
       local nNewEntId = EgtCopyGlob( vEntIds[i], nTpathGrpId, GDB_IN.LAST_SON)
       -- mi sposto dell'altezza layer
       EgtMove( nNewEntId, LayerParams.dLayHeight * LayerParams.vtSlicing, GDB_RT.GLOB)
+      
+      -- approssimo la curva e ne risetto punto iniziale (se chiusa)
+      local ptS = EgtSP( nNewEntId, GDB_ID.ROOT)
+      EgtApproxCurve( nNewEntId, GDB_CA.ARCS, s_dApproxTol)
+      if EgtCurveIsClosed( nNewEntId) then
+         EgtChangeClosedCurveStartPoint( nNewEntId, ptS, GDB_RT.GLOB)
+      end
+      
       EgtModifyCurveExtrusion( nNewEntId, LayerParams.vtSlicing, GDB_RT.GLOB)
       EgtSetColor( nNewEntId, EgtStdColor('MAROON'))
       
@@ -1675,13 +1860,11 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
       
       EgtSetInfo( nNewEntId, KEY_ASSOCIATED_P_CRV, vEntIds[i])
       EgtSetInfo( vEntIds[i], KEY_ASSOCIATED_TP_CRV, nNewEntId)
-     
-      if i == 1 then nNewFirstEnt = nNewEntId end
    end
    
    -- recupero i gruppi delle costolature
    local tabRibs = {}
-   local nFirst = nNewFirstEnt
+   local nFirst = EgtGetNext( nLastEnt)
    while nFirst do
       local sName = EgtGetName( nFirst)
       local vIds = EgtGetNameInGroup( nTpathGrpId, sName)
@@ -1701,23 +1884,29 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
          local bLoopRib = EgtGetInfo( tabRibs[i][1], KEY_LOOP_RIB, 'b') or false
          for j = 1, #tabRibs[i] - 1 do
             local bUserLink = ( EgtGetInfo( tabRibs[i][j], KEY_RIBS_USER_LINK, 'b') or false) and ( EgtGetInfo( tabRibs[i][j+1], KEY_RIBS_USER_LINK, 'b') or false)
+            local bSplitAfterTrim = ( EgtGetInfo( tabRibs[i][j], KEY_SPLIT_AFTER_TRIM, 'b') or false) and ( EgtGetInfo( tabRibs[i][j+1], KEY_SPLIT_AFTER_TRIM, 'b') or false)
             local nOrig1 = EgtGetInfo( tabRibs[i][j], KEY_ORIGINAL_RIB, 'i') or 0
             local nOrig2 = EgtGetInfo( tabRibs[i][j + 1], KEY_ORIGINAL_RIB, 'i') or 0
             local nSplitId1 = EgtGetInfo( tabRibs[i][j], KEY_SPLIT_ID, 'i') or 0
             local nSplitId2 = EgtGetInfo( tabRibs[i][j + 1], KEY_SPLIT_ID, 'i') or 0
             local bForceLink = ( nOrig1 == nOrig2 and nSplitId1 == nSplitId2)
-            local bCheckLinkedRibs = not bForceLink and not bUserLink
             
-            if ( nOrig1 ~= nOrig2 and bUserLink) or ( nSplitId1 == nSplitId2 and nOrig1 == nOrig2) then
+            -- creo collegamento se userlink, passate dello stesso setto o passate divise dopo trim
+            if ( nOrig1 ~= nOrig2 and bUserLink) or ( nSplitId1 == nSplitId2 and nOrig1 == nOrig2) or ( nOrig1 == nOrig2 and bSplitAfterTrim) then
                if not bLoopRib then
-                  CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, bCheckLinkedRibs, LayerParams.vtSlicing, nGrpTmp)
+                  CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, LayerParams.vtSlicing, nGrpTmp)
                else
-                  local nLinkId = CalcLoopRibLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp)
+                  local nLinkId = CalcLoopRibLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp, bForceLink)
                   -- se collegamento congiungo i setti in unico percorso
                   if nLinkId then
-                     EgtAddCurveCompoCurve( tabRibs[i][j], nLinkId)
-                     EgtAddCurveCompoCurve( tabRibs[i][j], tabRibs[i][j + 1])
-                     tabRibs[i][j+1] = tabRibs[i][j] -- aggiorno id nel vettore dei setti per gestire correttamente la curva allo step successivo
+                     EgtAddCurveCompoCurve( tabRibs[i][j+1], nLinkId, true, false)
+                     EgtAddCurveCompoCurve( tabRibs[i][j+1], tabRibs[i][j], true, false)
+                     -- aggiorno id nel vettore dei setti per gestire correttamente le curve negli step successivi
+                     for k = 0, j do
+                        if tabRibs[i][k] == tabRibs[i][j] then
+                           tabRibs[i][k] = tabRibs[i][j+1]
+                        end
+                     end
                   end
                end
             end
@@ -1726,7 +1915,7 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
          -- se LoopRib aggiungo collegamento tra primo e ultimo setto del gruppo
          if bLoopRib then
             local nTotCrv = #tabRibs[i]
-            local nLinkId = CalcLoopRibLink( tabRibs[i][nTotCrv], tabRibs[i][1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp)
+            local nLinkId = CalcLoopRibLink( tabRibs[i][nTotCrv], tabRibs[i][1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp, false)
             if nLinkId then
                -- se curva unica
                if tabRibs[i][nTotCrv] == tabRibs[i][1] then
@@ -1761,7 +1950,7 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
       local bLoop2 = EgtGetInfo( tabRibs[i + 1][1], KEY_LOOP_RIB, 'b') or false
       if bLink1 and bLink2 and not bLoop1 and not bLoop2 then
          local nCnt = #tabRibs[i]
-         CalcRibsLink( tabRibs[i][nCnt], tabRibs[i + 1][1], nLoopGrp, false, true, LayerParams.vtSlicing, nGrpTmp)
+         CalcRibsLink( tabRibs[i][nCnt], tabRibs[i + 1][1], nLoopGrp, false, LayerParams.vtSlicing, nGrpTmp)
       end
    end
    
@@ -1771,7 +1960,7 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
    if nType == RIB_TYPE.UNBOUNDED then
       bForceNoSolidBorder = true
    end
-   local nCrvRib = nNewFirstEnt
+   local nCrvRib = EgtGetNext( nLastEnt)
    while nCrvRib do
       -- verifico se necessario lead in
       local nPrev = EgtGetPrev( nCrvRib)
@@ -1794,7 +1983,7 @@ end
 --------------------------------------------------------------------
 local function AddSpiralVaseLeadOut( nOldId, LayerParams)
    
-    if LayerParams.nLeadOutType ~= LEAD_TYPE.NONE then
+   if LayerParams.nLeadOutType ~= LEAD_TYPE.NONE then
       EgtTrimCurveEndAtLen( nOldId, EgtCurveLength( nOldId) - LayerParams.dOffsetLP)
       local nLeadOut = AddLeadOut( nOldId, LayerParams, EgtGetParent( nOldId))
       if nLeadOut then
@@ -1837,7 +2026,8 @@ local function SpiralVase( vLayIds, LayerParams)
       local vCrvGrpIds = EgtGetNameInGroup( vLayIds[ nIdx], CONTOUR_GRP.."*")
       if #vCrvGrpIds > 1 then
          -- se più di un gruppo di curve warning
-         EgtOutLog( 'Warning : in spiral vase mode more than one curve (layer '..tostring( nIdx)..') - CalcToolPath')
+         EgtOutBox( 'Error in spiral vase : layer ' .. tostring( nIdx) .. ' has more than one toolpath', 'ToolPathCalc')
+         return false
       end
       
       for i = 1, #vCrvGrpIds do
@@ -1860,9 +2050,15 @@ local function SpiralVase( vLayIds, LayerParams)
          end
 
          -- creo il percorso di lavoro :
-         local nEntId = EgtGetFirstInGroup( nPathGrpId)
-         while nEntId do
-            local nNewEntId = EgtCopyGlob( nEntId, nTpathGrpId, GDB_IN.LAST_SON)
+         local vEntIds = EgtGetAllInGroup( nPathGrpId)
+         if #vEntIds > 1 then
+            EgtOutBox( 'Error in spiral vase : layer ' .. tostring( nIdx) .. ' has more than one toolpath', 'ToolPathCalc')
+            return false
+         end
+         
+         local nNewEntId = EgtCopyGlob( vEntIds[1] or GDB_ID.NULL, nTpathGrpId, GDB_IN.LAST_SON)
+         
+         if nNewEntId then
             
             local vtMove = V_NULL()
             -- eventuale spostamento dell'altezza layer
@@ -1870,7 +2066,7 @@ local function SpiralVase( vLayIds, LayerParams)
                vtMove = LayerParams.dLayHeight * LayerParams.vtSlicing
                EgtMove( nNewEntId, vtMove, GDB_RT.GLOB)
             end
-
+      
             EgtModifyCurveExtrusion( nNewEntId, LayerParams.vtSlicing, GDB_RT.GLOB)
             EgtSetInfo( nNewEntId, KEY_CRV_STRAND, LayerParams.dStrand)
             
@@ -1882,7 +2078,7 @@ local function SpiralVase( vLayIds, LayerParams)
             EgtSetColor( nNewEntId, EgtStdColor('GRAY'))
             
             -- se primo layer
-            if bFirst and nNewEntId then
+            if bFirst then
                -- mi sposto dell'altezza layer
                EgtMove( nNewEntId, LayerParams.dLayHeight * LayerParams.vtSlicing, GDB_RT.GLOB)
                -- eventuale lead in
@@ -1914,15 +2110,23 @@ local function SpiralVase( vLayIds, LayerParams)
                EgtSpiralizeCurveAlongExtrusion( nNewEntId, LayerParams.dLayHeight)
             end
             
-            nOldPathId = nEntId
+            -- approssimo la curva
+            if nNewEntId then
+               local ptS = EgtSP( nNewEntId, GDB_ID.ROOT)
+               EgtApproxCurve( nNewEntId, GDB_CA.ARCS, s_dApproxTol)
+               if EgtCurveIsClosed( nNewEntId) then
+                  EgtChangeClosedCurveStartPoint( nNewEntId, ptS, GDB_RT.GLOB)
+               end
+            end
+            
+            nOldPathId = vEntIds[1]
             nOldId = nNewEntId
-            nEntId = EgtGetNext( nEntId)
          end
-         
+
          -- aggiorno il box dei toolpath
          local b3Box = ComputeToolPathBox( nTpathGrpId)
          b3Tot:Add( b3Box)
-         
+
       end
       
       if EgtProcessEvents( EgtIf( PRINT, 300, 0) + nIdx / #vLayIds * 100, 0) == 1 then
@@ -1955,11 +2159,6 @@ function CalcToolPath.Exec( nPartId)
    -- recupero i parametri per calcolo dei toolpath
    local LayerParams = GetLayerParamsForToolPathCalc()
    
-   -- altezza necessaria per correzione wipe
-   local dNxy = sqrt( LayerParams.vtSlicing:getX() * LayerParams.vtSlicing:getX() + LayerParams.vtSlicing:getY() * LayerParams.vtSlicing:getY())
-   local dHBox = EgtGetInfo( s_nPartId, KEY_BOX_MIN_Z, 'i') or 0
-   s_dHMin = LayerParams.dTDiam / 2 * dNxy + dHBox
-   
    -- caso spiral vase
    if LayerParams.bSpiralVase then
       return SpiralVase( vLayIds, LayerParams)
@@ -1970,6 +2169,8 @@ function CalcToolPath.Exec( nPartId)
    -- Ciclo sui layer
    for nIdx = 1, #vLayIds do
       
+      s_nCurrIdx = nIdx
+      
       -- scorro tutti i gruppi di contorni
       local nCrvGrpId = EgtGetFirstNameInGroup( vLayIds[ nIdx], CONTOUR_GRP.."*")
       while nCrvGrpId do

LuaLibs/RunCalcSolids.lua

@@ -14,6 +14,7 @@ local AMD = require( 'AddManData')
 
 --------------------------------------------------------------------
 local s_dTol = 0.1
+local s_nSimplifiedSection = 0
 
 ---------------------------------------------------------------------
 local function GetLayerParamsForSolidCalc( nPartId)
@@ -21,51 +22,38 @@ local function GetLayerParamsForSolidCalc( nPartId)
    LayerParams.bSpiralVase = EgtGetInfo( nPartId, KEY_SPIRAL_VASE, 'b') or false
    LayerParams.dLayHeight = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd')
    LayerParams.vtSlicing = EgtGetInfo( nPartId, KEY_SLICING_DIR, 'v')
+   LayerParams.dStrand = EgtGetInfo( nPartId, KEY_STRAND, 'd')
    return LayerParams
 end
 
 ---------------------------------------------------------------------
 local function CalcSectionParams( dStrand, dH)
-   local dL = dStrand
-   local dLm = dStrand / 10
-   local dHm = dH / 6
-   local dD1 = 0.5 * dL - dLm
-   local dD2 = 0.5 * dL - dD1 
-   local dD3 = dHm
-   local dD4 = dH - 2 * dD3
-   return dD1, dD2, dD3, dD4
+   local dBevelX = 0
+   local dBevelY = 0
+   if s_nSimplifiedSection == 0 then
+      -- sezione ottagonale
+      dBevelX = dStrand / 10
+      dBevelY = dH / 6
+   end
+   return dBevelX, dBevelY
 end
 
 ---------------------------------------------------------------------
 local function CreateSection( ptS, vtDir, dStrand, dH, vtSlicing, nSolidGrp)
 
-   local dD1, dD2, dD3, dD4 = CalcSectionParams( dStrand, dH)
-   local ptA = ptS - dH * vtSlicing + dD1 * vtDir
-   local ptB = ptA + dD2 * vtDir + dD3 *vtSlicing
-   local ptC = ptB + dD4 * vtSlicing
+   local dBevelX, dBevelY = CalcSectionParams( dStrand, dH)
+   local ptA = ptS - dH * vtSlicing  + ( 0.5 * dStrand - dBevelX) * vtDir
+   local ptB = ptA + dBevelY * vtSlicing + dBevelX * vtDir
+   local ptC = ptB + ( dH - 2 * dBevelY) * vtSlicing
    local ptD = ptA + dH * vtSlicing
-   local ptE = ptD - 2 * dD1 * vtDir 
-   local ptF = ptC - 2 * ( dD1 + dD2) * vtDir
-   local ptG = ptB - 2 * ( dD1 + dD2) * vtDir
-   local ptH = ptA - 2 * dD1 * vtDir 
+   local ptE = ptD - ( dStrand - 2 * dBevelX) * vtDir
+   local ptF = ptC - dStrand * vtDir
+   local ptG = ptB - dStrand * vtDir
+   local ptH = ptA - ( dStrand - 2 * dBevelX) * vtDir
    
    local nId = EgtCurveCompoFromPoints( nSolidGrp, {ptA, ptB, ptC, ptD, ptE, ptF, ptG, ptH, ptA}, GDB_RT.GLOB)
    EgtInvertCurve( nId)
    
-   return nId 
-end
-
----------------------------------------------------------------------
-local function CreateHalfSection( ptS, vtDir, dStrand, dH, vtSlicing, nSolidGrp)
-
-   local dD1, dD2, dD3, dD4 = CalcSectionParams( dStrand, dH)
-   local ptA = ptS - dH * vtSlicing + dD1 * vtDir
-   local ptB = ptA + dD2 * vtDir + dD3 * vtSlicing
-   local ptC = ptB + dD4 * vtSlicing
-   local ptD = ptA + dH * vtSlicing
- 
-   local nId = EgtCurveCompoFromPoints( nSolidGrp, { ptS - dH * vtSlicing, ptA, ptB, ptC, ptD, ptS}, GDB_RT.GLOB)
-   
    return nId
 end
 
@@ -73,30 +61,48 @@ end
 local function CreateSpiralVaseCap( nSectId, vtDir, nSolidGrp)
    
    local vPt = {}
-   for i = 0, 7 do
+   local nLast = EgtIf( s_nSimplifiedSection == 1, 3, 7)
+   for i = 0, nLast do
       vPt[i + 1] = EgtUP( nSectId, i, GDB_ID.ROOT)
    end
    
    local vCrvs = {}
-   vCrvs[1] = EgtArc2PV( nSolidGrp, vPt[1], vPt[2], vtDir, GDB_RT.GLOB)
-   vCrvs[2] = EgtArc2PV( nSolidGrp, vPt[8], vPt[3], vtDir, GDB_RT.GLOB)
-   vCrvs[3] = EgtArc2PV( nSolidGrp, vPt[7], vPt[4], vtDir, GDB_RT.GLOB)
-   vCrvs[4] = EgtArc2PV( nSolidGrp, vPt[6], vPt[5], vtDir, GDB_RT.GLOB)
-   vCrvs[5] = EgtCurveCompo( nSolidGrp, {vCrvs[1]}, false, GDB_RT.GLOB)
-   EgtCloseCurveCompo( vCrvs[5])
-   vCrvs[6] = EgtCurveCompo( nSolidGrp, {vCrvs[4]}, false, GDB_RT.GLOB)
-   EgtCloseCurveCompo( vCrvs[6])
-   local nSurf1 = EgtSurfTmRuled( nSolidGrp, vCrvs[1], vCrvs[2], GDB_RUL.ISOPAR, s_dTol)
-   local nSurf2 = EgtSurfTmRuled( nSolidGrp, vCrvs[2], vCrvs[3], GDB_RUL.ISOPAR, s_dTol)
-   local nSurf3 = EgtSurfTmRuled( nSolidGrp, vCrvs[3], vCrvs[4], GDB_RUL.ISOPAR, s_dTol)
-   local nSurf4 = EgtSurfTmByRegion( nSolidGrp, vCrvs[5], s_dTol)
-   local nSurf5 = EgtSurfTmByRegion( nSolidGrp, vCrvs[6], s_dTol)
-   local nCapSrf = EgtSurfTmBySewing( nSolidGrp, {nSurf1, nSurf2, nSurf3, nSurf4, nSurf5})
-
+   -- calcolo gli archi che definiscono la superficie laterale
+   if s_nSimplifiedSection == 1 then
+      -- sezione quadrata
+      vCrvs[1] = EgtArc2PV( nSolidGrp, vPt[1], vPt[2], vtDir, GDB_RT.GLOB)
+      vCrvs[2] = EgtArc2PV( nSolidGrp, vPt[4], vPt[3], vtDir, GDB_RT.GLOB)
+   else
+      -- sezione ottagonale
+      vCrvs[1] = EgtArc2PV( nSolidGrp, vPt[1], vPt[2], vtDir, GDB_RT.GLOB)
+      vCrvs[2] = EgtArc2PV( nSolidGrp, vPt[8], vPt[3], vtDir, GDB_RT.GLOB)
+      vCrvs[3] = EgtArc2PV( nSolidGrp, vPt[7], vPt[4], vtDir, GDB_RT.GLOB)
+      vCrvs[4] = EgtArc2PV( nSolidGrp, vPt[6], vPt[5], vtDir, GDB_RT.GLOB)
+   end
+   -- creo le rigate
+   local vSurfs = {}
+   for i = 1, #vCrvs - 1 do
+      vSurfs[i] = EgtSurfTmRuled( nSolidGrp, vCrvs[i], vCrvs[i+1], GDB_RUL.ISOPAR, s_dTol)
+   end
+   -- calcolo le superfici top e bottom del cap
+   local nCrvBottom = EgtCurveCompo( nSolidGrp, {vCrvs[1]}, false, GDB_RT.GLOB)
+   EgtCloseCurveCompo( nCrvBottom)
+   local nSurfBottom = EgtSurfTmByRegion( nSolidGrp, nCrvBottom, s_dTol)
+   local nCrvTop = EgtCurveCompo( nSolidGrp, {vCrvs[#vCrvs]}, false, GDB_RT.GLOB)
+   EgtCloseCurveCompo( nCrvTop)
+   local nSurfTop = EgtSurfTmByRegion( nSolidGrp, nCrvTop, s_dTol)
+   table.insert( vSurfs, nSurfTop)
+   table.insert( vSurfs, nSurfBottom)
+   
+   local nCapSrf = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
+   
+   -- cancello curve di costruzione
    for i = 1, #vCrvs do
       EgtErase( vCrvs[i])
    end
-
+   EgtErase( nCrvTop)
+   EgtErase( nCrvBottom)
+   
    return nCapSrf
 end
 
@@ -104,16 +110,17 @@ end
 local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
    
    -- gruppo temporaneo per conti 
-   local nGrpTmp = EgtGroup( nSolidGrp)
+   local nGrpTmp = EgtGroup( nSolidGrp, Frame3d( ORIG(), LayerParams.vtSlicing, GDB_RT.GLOB))
    
    local ptS = EgtSP( nCrvId, GDB_ID.ROOT)
    local vtS = EgtSV( nCrvId, GDB_ID.ROOT)
    local ptE = EgtEP( nCrvId, GDB_ID.ROOT)
    local vtE = EgtEV( nCrvId, GDB_ID.ROOT)
+   local dDelta = ( ptE - ptS) * LayerParams.vtSlicing
    -- appiattisco la curva
    local nCrvCopy = EgtCopyGlob( nCrvId, nGrpTmp)
-   local dDelta = ( ptE - ptS) * LayerParams.vtSlicing
-   EgtSpiralizeCurveAlongExtrusion( nCrvCopy, - dDelta)
+   EgtModifyCurveExtrusion( nCrvCopy, LayerParams.vtSlicing, GDB_RT.GLOB)
+   EgtProjectCurveOnPlane( nCrvCopy, ptS, LayerParams.vtSlicing, GDB_RT.GLOB)
    EgtMergeCurvesInCurveCompo( nCrvCopy)
    EgtChangeClosedCurveStartPoint( nCrvCopy, ptS, GDB_RT.GLOB)
   
@@ -140,12 +147,19 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
       local dMove = ( ptRef - ptS) * LayerParams.vtSlicing
       EgtMove( vCrvs[i+1], LayerParams.vtSlicing * dMove, GDB_RT.GLOB)
       EgtSpiralizeCurveAlongExtrusion( vCrvs[i+1], dDelta)
-      
+
       -- modifico la curva per congiungerla ai caps
-      EgtAddCurveCompoLine( vCrvs[i+1], ptRef, false, GDB_RT.GLOB)
+      EgtApproxCurve( vCrvs[i+1], GDB_CA.LINES, s_dTol)
+      EgtModifyCurveStartPoint( vCrvs[i+1], ptRef, GDB_RT.GLOB)
       local ptRefEnd = EgtUP( nSectE, i, GDB_ID.ROOT)
-      EgtAddCurveCompoLine( vCrvs[i+1], ptRefEnd, true, GDB_RT.GLOB)
+      local _, _, dParMinDist = EgtPointCurveDist( ptRefEnd, vCrvs[i+1], GDB_ID.ROOT)
+      local _, dParE = EgtCurveDomain( vCrvs[i+1])
+      if abs( dParE - dParMinDist) > GEO.EPS_SMALL then
+         EgtTrimCurveEndAtParam( vCrvs[i+1], dParMinDist)
+      end
+      EgtModifyCurveEndPoint( vCrvs[i+1], ptRefEnd, GDB_RT.GLOB)
    end
+   
    local vSurfs = {}
    for i = 1, #vCrvs - 1 do
       vSurfs[i] = EgtSurfTmRuled( nGrpTmp, vCrvs[i], vCrvs[i+1], GDB_RUL.MINDIST, s_dTol)
@@ -154,7 +168,8 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
          return nil
       end
    end
-   local nSrfId = EgtSurfTmBySewing( nSolidGrp, vSurfs)
+
+   local nSrfId = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
   
    -- creazione del mezzo disco iniziale
    local nCap1 = CreateSpiralVaseCap( nSectId, - vtS, nSolidGrp)
@@ -165,14 +180,14 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
    -- cancello le curve usate per la costruzione
    EgtErase( nGrpTmp)
 
-   return EgtSurfTmBySewing( nSolidGrp, { nSrfId, nCap1, nCap2})
+   return EgtSurfTmByTriangles( nSolidGrp, { nSrfId, nCap1, nCap2})
 end
 
 ----------------------------------------------------------------------
 local function CreateStandardSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
 
-   local dD1, dD2, dD3, dD4 = CalcSectionParams( dStrand, LayerParams.dLayHeight)
-   local nSrfId = EgtSurfTmRectSwept( nSolidGrp, dStrand, LayerParams.dLayHeight, dD2, dD3, nCrvId, GDB_RSCT.BEVEL, s_dTol)
+   local dBevelX, dBevelY = CalcSectionParams( dStrand, LayerParams.dLayHeight)
+   local nSrfId = EgtSurfTmRectSwept( nSolidGrp, dStrand, LayerParams.dLayHeight, dBevelX, dBevelY, nCrvId, GDB_RSCT.BEVEL, s_dTol)
    return nSrfId
 end
 
@@ -185,6 +200,66 @@ local function CreateSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
    end
 end
 
+---------------------------------------------------------------------
+local function CreateDirectionArrow( nCrvId, nSolidGrp, vtSlicing, dStrand, nLayer)
+   
+   local ptS = EgtSP( nCrvId, GDB_RT.GLOB)
+   local vtS = EgtSV( nCrvId, GDB_RT.GLOB)
+   local dCrvLen = EgtCurveLength( nCrvId)
+   if dCrvLen > 2 * dStrand then
+      local dPar = EgtCurveParamAtLength( nCrvId, 4/5 * dStrand)
+      ptS = EgtUP( nCrvId, dPar, GDB_RT.GLOB)
+      vtS = EgtUV( nCrvId, dPar, -1, GDB_RT.GLOB)
+   end
+      
+   local vt2 = Vector3d( vtS)
+   vt2:rotate( vtSlicing, 90)
+   local dLen = 4/5 * dStrand
+   local pt1 = ptS + 0.5 * dLen * vt2
+   local pt2 = ptS - 0.5 * dLen * vt2
+   local pt3 = ptS + vtS * dLen
+   local nCompo = EgtCurveCompoFromPoints( nSolidGrp, { pt1, pt2, pt3, pt1}, GDB_RT.GLOB)
+   EgtMove( nCompo, 100 * GEO.EPS_SMALL * vtSlicing, GDB_RT.GLOB)
+   local nSrf = EgtSurfFlatRegion( nSolidGrp, { nCompo})
+   EgtErase( nCompo)
+   EgtSetColor( nSrf, RED())
+   EgtSetInfo( nSrf, KEY_SLICE_NBR, nLayer)
+   EgtSetStatus( nSrf, GDB_ST.OFF)
+   EgtSetMode( nSrf, GDB_MD.HIDDEN)
+   EgtSetName( nSrf, DIR_ARROW)
+   
+end
+
+---------------------------------------------------------------------
+local function CreateRecursiveSolid( nCrvId, vSurfs, nSolidGrp, LayerParams, dStrand)
+
+   -- tento la creazione del solido
+   local nSurf = CreateSolid( nCrvId, nSolidGrp, LayerParams, dStrand - 50 * GEO.EPS_SMALL)
+   if nSurf then
+      EgtErase( nCrvId)
+      table.insert( vSurfs, nSurf)
+      return true
+   else
+      -- se curva singola esco perchè non è possibile spezzare ulteriormente
+      local _, dParE = EgtCurveDomain( nCrvId)
+      if abs( dParE - 1) < GEO.EPS_SMALL then
+         EgtErase( nCrvId)
+         return false
+      end
+      -- se non si tratta di curva singola, spezzo a metà e tento sulle due sottocurve
+      local dParSplit = floor( dParE / 2 + 0.5)
+      local nCrvSplit = EgtSplitCurveAtParam( nCrvId, dParSplit)
+      if not nCrvSplit then
+         -- errore nello split
+         EgtErase( nCrvId)
+         return false
+      end
+      local bOk = CreateRecursiveSolid( nCrvId, vSurfs, nSolidGrp, LayerParams, dStrand)
+      bOk = bOk and CreateRecursiveSolid( nCrvSplit, vSurfs, nSolidGrp, LayerParams, dStrand)
+      return bOk
+   end
+end
+
 ---------------------------------------------------------------------
 local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
   
@@ -207,7 +282,7 @@ local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
    elseif nType == TYPE.AUX_SOLID then
       Color = EgtStdColor( 'AQUA')
    end
-   local dStrand = EgtGetInfo( nCrvId, KEY_CRV_STRAND, 'd')
+   local dStrand = EgtGetInfo( nCrvId, KEY_CRV_STRAND, 'd') or LayerParams.dStrand
    
    local nCopyId = EgtCopyGlob( nCrvId, nSolidGrp)
    local nId = GDB_ID.NULL
@@ -224,6 +299,12 @@ local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
       nId = EgtSplitCurve( nCopyId, nParts)
    end
    
+   -- freccia direzionale
+   local sName = EgtGetName( nCrvId)
+   if nType ~= TYPE.COASTING and nType ~= TYPE.LINK and sName ~= LEAD_IN_CRV and sName ~= LEAD_OUT_CRV and sName ~= LINK_CRV then
+      CreateDirectionArrow( nCrvId, nSolidGrp, LayerParams.vtSlicing, dStrand, nLayer)
+   end
+   
    if nId == GDB_ID.NULL then return false end
    local bOk = true
    for nInd = 0, nParts - 1 do
@@ -231,44 +312,42 @@ local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
       local nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 5 * GEO.EPS_SMALL)
       if not nSrfId then
          EgtOutLog( 'Warning : CreateSolid failed '.. '(layer '..tostring( nLayer)..', curve '..tostring( nCrvId)..')')
-         -- se non ultima, provo a spostare l'estremità finale
-         if nInd < nParts - 1 then
-            local nCopyId = EgtCopy( nGuideId + 1, nGuideId, GDB_IN.AFTER)
-            if nCopyId then
-               local LEN_TRIM = 10
-               local bOk1 = EgtTrimCurveEndAtLen( nCopyId, LEN_TRIM)
-               local bOk2 = EgtAddCurveCompoCurve( nGuideId, nCopyId)
-               local bOk3 = EgtTrimCurveStartAtLen( nGuideId + 1, LEN_TRIM)
-               nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 5 * GEO.EPS_SMALL)
-               if not nSrfId then
-                  nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 50 * GEO.EPS_SMALL)
+         -- ritento con strand più piccolo
+         nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 50 * GEO.EPS_SMALL)         
+         
+         if not nSrfId then
+            EgtOutLog( 'Warning : CreateSolid_1 failed '.. '(layer '..tostring( nLayer)..', curve '..tostring( nCrvId)..')')
+            -- se non ultima, provo a spostare l'estremità finale
+            if nInd < nParts - 1 then
+               local nCopyId = EgtCopy( nGuideId + 1, nGuideId, GDB_IN.AFTER)
+               if nCopyId then
+                  local LEN_TRIM = 10
+                  local bOk1 = EgtTrimCurveEndAtLen( nCopyId, LEN_TRIM)
+                  local bOk2 = EgtAddCurveCompoCurve( nGuideId, nCopyId)
+                  local bOk3 = EgtTrimCurveStartAtLen( nGuideId + 1, LEN_TRIM)
+                  nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 5 * GEO.EPS_SMALL)
+                  if not nSrfId then
+                     nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams, dStrand - 50 * GEO.EPS_SMALL)
+                  end
                end
             end
          end
-         -- ritento spezzando la curva
+         
+         -- ritento spezzando la curva in modo ricorsivo fino ad inidividuare delle sottocurve su cui è possibile calcolare il solido
          if not nSrfId then
             EgtOutLog( 'Warning : CreateSolid_2 failed')
             local nGrp = EgtGroup( nSolidGrp, Frame3d( ORIG(), LayerParams.vtSlicing), GDB_RT.GLOB)
             EgtRelocateGlob( nGuideId, nGrp)
             EgtApproxCurve( nGuideId, GDB_CA.LINES, 100 * GEO.EPS_SMALL)
             EgtRelocateGlob( nGuideId, nSolidGrp)
-            local nFirstCrv, nCrvNbr = EgtSplitCurveAtCorners( nGuideId, 30)
-            if nFirstCrv and nCrvNbr > 1 then
-               local nSrfIds = {}
-               for nInd2 = 0, nCrvNbr-1 do
-                  local nSrfId2 = CreateSolid( nFirstCrv + nInd2, nSolidGrp, LayerParams, dStrand - 50 * GEO.EPS_SMALL)
-                  EgtErase( nFirstCrv + nInd2)
-                  if nSrfId2 then
-                     table.insert( nSrfIds, nSrfId2)
-                  end
-               end
-               if #nSrfIds == nCrvNbr then
-                  nSrfId = EgtSurfTmBySewing( nSolidGrp, nSrfIds)
-               else
-                  EgtOutLog( 'Warning : CreateSolid_3 failed')
-               end
-            else
-               EgtErase( nFirstCrv)
+
+            local vSurfs = {}
+            local bOk = CreateRecursiveSolid( nGuideId, vSurfs, nSolidGrp, LayerParams, dStrand)
+            if #vSurfs > 0 then
+               nSrfId = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
+            end
+            if not nSrfId or bOk == false then
+               EgtOutLog( 'Warning : CreateSolid_3 failed')
             end
             EgtErase( nGrp)
          end
@@ -278,7 +357,7 @@ local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
          EgtSetColor( nSrfId, Color)
          EgtSetInfo( nSrfId, KEY_TYPE, nType)
          EgtSetInfo( nSrfId, KEY_SLICE_NBR, nLayer)
-      else 
+      else
          bOk = false
          EgtOutLog( 'Warning : CreateSolid_Sewing failed')
       end
@@ -293,6 +372,10 @@ function RunCalcSolids.Exec()
 
    -- per determinare il tempo di calcolo
    EgtStartCounter()
+   
+   -- verifico se richiesta sezione semplificata ( rettangolare)
+   local sIniFile = EgtGetIniFile()
+   s_nSimplifiedSection = EgtGetNumberFromIni( 'Solids', 'SimplifiedSection', 0, sIniFile)
 
    local nPartIndex = 1
    local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) or EgtGetFirstNameInGroup( GDB_ID.ROOT, PART)
@@ -304,6 +387,11 @@ function RunCalcSolids.Exec()
 
          if bCalcSolid then
 
+            -- recupero il suo frame
+            local nFrameId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( nPartId, 'Frame'), 'FramePart')
+            local ptOrig = EgtSP( nFrameId or GDB_ID.NULL, GDB_ID.ROOT)
+            EgtSetInfo( nPartId, KEY_ORIG_REF, ptOrig)
+            
             -- recupero i suoi slice
             local vLayIds = EgtGetNameInGroup( nPartId, SLICE_LAYER .. '*')
             if not vLayIds then
@@ -339,7 +427,7 @@ function RunCalcSolids.Exec()
                      EgtSetName( nSolidGrpId, SOLID_GRP)
                      EgtSetLevel( nSolidGrpId, GDB_LV.TEMP)
                      -- scorro le curve del percorso utensile
-                     local nId = EgtGetFirstInGroup( nTPathGrpId) 
+                     local nId = EgtGetFirstInGroup( nTPathGrpId)
                      while nId do
                         local bOk = CreateSolidFromCurve( nId, nSolidGrpId, LayerParams, nLayer)
                         nId = EgtGetNext( nId)
@@ -389,9 +477,8 @@ function RunCalcSolids.Exec()
                EgtSetInfo( nViewId, SOLID_GRP, true)
             end
          end
-
       end
-
+      
       nPartIndex = nPartIndex + 1
       nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) or EgtGetNextName( nPartId, PART)
    end

LuaLibs/RunMachParamFromSWCalc.lua

@@ -1,4 +1,4 @@
--- RunMachParamFromSWCalc.lua by Egaltech s.r.l. 2022/12/28
+-- RunMachParamFromSWCalc.lua by Egaltech s.r.l. 2024/01/30
 -- Calcolo dei parametri di stampa
 
 -- Tabella per definizione modulo
@@ -62,7 +62,7 @@ function RunMachParamFromSWCalc.Exec()
    while nPartId do
       if not EgtGetInfo( nPartId, KEY_PART_ON_TABLE, 'b') then
          nPartId = EgtGetNextPart( nPartId)
-         goto continue 
+         goto continue
       end
       -- recupero i parametri di lavorazione del pezzo
       local dSliceStep = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd')
@@ -77,6 +77,8 @@ function RunMachParamFromSWCalc.Exec()
       while nLayerId do
          -- rimuovo eventuale info precedente del tempo di attesa
          EgtRemoveInfo( nLayerId, KEY_WAITING_TIME)
+         -- divido curve in base alla larghezza strand
+         local LengthCrvList = {}
          -- calcolo lunghezza totale del layer
          local dTotLayerLength = 0
          local dTotLayerLengthForMass = 0
@@ -84,14 +86,29 @@ function RunMachParamFromSWCalc.Exec()
          local nCrvId = EgtGetFirstNameInGroup( nLayerId, CONTOUR_GRP .. '*')
          while nCrvId do
             local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP)
-            -- sommo lunghezze percorsi
+            -- recupero lunghezze percorsi
             local dTotCrvLength = 0
             local dTotCrvLengthForMass = 0
-            nShellId = EgtGetFirstInGroup( nToolPathId)
+            local nShellId = EgtGetFirstInGroup( nToolPathId)
             while nShellId do
-               dTotCrvLength = dTotCrvLength + EgtCurveLength( nShellId)
+               local dShellWidth = EgtGetInfo( nShellId, KEY_CRV_STRAND, "d")
+               local dShellLength = EgtCurveLength( nShellId)
+               local bFound = false
+               for LengthIndex = 1, #LengthCrvList do
+                  if LengthCrvList[LengthIndex].Width == dShellWidth then
+                     table.insert( LengthCrvList[LengthIndex].IdList, nShellId) 
+                     LengthCrvList[LengthIndex].Length = LengthCrvList[LengthIndex].Length + dShellLength
+                     bFound = true
+                     break
+                  end
+               end
+               if not bFound then
+                  table.insert( LengthCrvList, { Width = dShellWidth, IdList = { nShellId}, Length = dShellLength})
+               end
+               -- sommo per lunghezza totale
+               dTotCrvLength = dTotCrvLength + dShellLength
                if EgtGetName( nShellId) ~= WIPE_CRV then
-                  dTotCrvLengthForMass = dTotCrvLengthForMass + EgtCurveLength( nShellId)
+                  dTotCrvLengthForMass = dTotCrvLengthForMass + dShellLength
                end
                nShellId = EgtGetNext( nShellId)
             end
@@ -132,11 +149,17 @@ function RunMachParamFromSWCalc.Exec()
             table.insert( nOrigLayers, nLayerId)
          end
          EgtSetInfo( nLayerResultId, KEY_SLICEID, nOrigLayers)
+         -- calcolo strand medio (media ponderata sulla lunghezza)
+         local dStrandMean = 0
+         for nMeanIndex = 1, #LengthCrvList do
+            dStrandMean = dStrandMean + LengthCrvList[nMeanIndex].Width * LengthCrvList[nMeanIndex].Length
+         end
+         dStrandMean = dStrandMean / EgtIf( dTotLayerLength > 0.1, dTotLayerLength, 1)
          -- calcolo costante MF
          local dMF = 1
          local dSC = 1
          if dTotLayerArea > 1 then
-            dMF = dTotLayerLength * dStrand / dTotLayerArea * 100
+            dMF = dTotLayerLength * dStrandMean / dTotLayerArea * 100
             dSC = dStrandCount
          else
             dMF = 100
@@ -151,12 +174,12 @@ function RunMachParamFromSWCalc.Exec()
             end
          end
          -- calcolo tempi stimati del layer
-         local dTMin = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.AMin) / MATERIAL.BMin * pow( 0.25 * dStrand, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
-         local dTTrg = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.ATrg) / MATERIAL.BTrg * pow( 0.25 * dStrand, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
-         local dTMax = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.AMax) / MATERIAL.BMax * pow( 0.25 * dStrand, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
-         local dFMin = dTotLayerLength / dTMax * 60
-         local dFTrg = dTotLayerLength / dTTrg * 60
-         local dFMax = dTotLayerLength / dTMin * 60
+         local dTMin = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.AMin) / MATERIAL.BMin * pow( 0.25 * dStrandMean, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
+         local dTTrg = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.ATrg) / MATERIAL.BTrg * pow( 0.25 * dStrandMean, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
+         local dTMax = ( MATERIAL.K_LAYERTIME / 100.0) * ( dMF + MATERIAL.AMax) / MATERIAL.BMax * pow( 0.25 * dStrandMean, MATERIAL.KW) * pow( dSliceStep, MATERIAL.KZ) * pow( dSC, MATERIAL.KN)
+         local dFMin = dTotLayerLength / EgtIf( dTMax > 0.1, dTMax, 1) * 60
+         local dFTrg = dTotLayerLength / EgtIf( dTTrg > 0.1, dTTrg, 1) * 60
+         local dFMax = dTotLayerLength / EgtIf( dTMin > 0.1, dTMin, 1) * 60
          local dLayerTime = dTTrg
          if dLayerFeed == 0 then
             dLayerFeed = dFTrg
@@ -165,7 +188,7 @@ function RunMachParamFromSWCalc.Exec()
          end
          dLayerWait = floor( dTMin + 0.5) - floor( dLayerTime + 0.5)
          -- calcolo la portata
-         local Vf = dLayerFeed * ( ( dStrand - dSliceStep) * dSliceStep + pi * pow( dSliceStep / 2, 2)) / 1000
+         local Vf = dLayerFeed * ( ( dStrandMean - dSliceStep) * dSliceStep + pi * pow( dSliceStep / 2, 2)) / 1000
          -- calcolo speed
          local dSpeed = ( MATERIAL.K_EXTRUSION / 100.0) * ( MACHINING.K / 100.0) * pow( Vf / MATERIAL.C1, 1 / MATERIAL.C2)
          -- verifico se speed esce da minimo e massimo della macchina
@@ -179,16 +202,30 @@ function RunMachParamFromSWCalc.Exec()
             dSpeed = dSMax
          end
          if not bSpeedOk then
-            dLayerFeed = ( MATERIAL.C1 * pow( ( dSpeed / (( MATERIAL.K_EXTRUSION / 100.0) * ( MACHINING.K / 100.0))), MATERIAL.C2)) * 1000 / ( ( dStrand - dSliceStep) * dSliceStep + pi * pow( dSliceStep / 2, 2))
-            dLayerTime = dTotLayerLength / dLayerFeed * 60
+            if dTotLayerLength > 0.1 then
+               dLayerFeed = ( MATERIAL.C1 * pow( ( dSpeed / (( MATERIAL.K_EXTRUSION / 100.0) * ( MACHINING.K / 100.0))), MATERIAL.C2)) * 1000 / ( ( dStrandMean - dSliceStep) * dSliceStep + pi * pow( dSliceStep / 2, 2))
+               dLayerTime = dTotLayerLength / dLayerFeed * 60
+            end
             dLayerWait = floor( dTMin + 0.5) - floor( dLayerTime + 0.5)
          end
          -- calcolo massa dello strato
-         local dLayerMass = dTotLayerLengthForMass * dSliceStep * dStrand * MATERIAL.Density * 1e-6
+         local dLayerMass = dTotLayerLengthForMass * dSliceStep * dStrandMean * MATERIAL.Density * 1e-6
          if dLayerMass and dLayerMass > 0 then
             dPrintMass = dPrintMass + dLayerMass
          end
-         -- scrivo info feed e speed in group toolpath
+         -- scrivo info feed su tutti i tratti
+         local dFeedMax = 0
+         for nWidthIndex = 1, #LengthCrvList do
+            local CurrWidth = LengthCrvList[nWidthIndex]
+            local CurrFeed = EgtIf( CurrWidth.Width > 0, dLayerFeed * dStrandMean / CurrWidth.Width, dLayerFeed) 
+            for nCurveIdIndex = 1, #CurrWidth.IdList do
+               EgtSetInfo( CurrWidth.IdList[nCurveIdIndex], KEY_FEED, CurrFeed)               
+            end
+            if CurrFeed > dFeedMax then
+               dFeedMax = CurrFeed
+            end
+         end
+         -- scrivo info speed in group toolpath
          nCrvId = EgtGetFirstNameInGroup( nLayerId, CONTOUR_GRP .. '*')
          while nCrvId do
             local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) or GDB_ID.NULL
@@ -202,13 +239,11 @@ function RunMachParamFromSWCalc.Exec()
             EgtSetInfo( nLayerResultId, KEY_WAITING_TIME, dLayerWait)
          end
          -- scrivo valori in struttura dati
-         --local nLayerResultId = EgtGetFirstNameInGroup( nResultLayerId, nLayerIndex)
          EgtSetInfo( nLayerResultId, KEY_TMIN, dTMin)
          EgtSetInfo( nLayerResultId, KEY_TTRG, dTTrg)
          EgtSetInfo( nLayerResultId, KEY_TMAX, dTMax)
-         EgtSetInfo( nLayerResultId, KEY_FMIN, dFMin)
          EgtSetInfo( nLayerResultId, KEY_FTRG, dFTrg)
-         EgtSetInfo( nLayerResultId, KEY_FMAX, dFMax)
+         EgtSetInfo( nLayerResultId, KEY_FMAX, dFeedMax)
          EgtSetInfo( nLayerResultId, KEY_TCUR, dLayerTime)
          EgtSetInfo( nLayerResultId, KEY_FCUR, dLayerFeed)
          EgtSetInfo( nLayerResultId, KEY_LENGTH, dTotLayerLength)
@@ -220,11 +255,12 @@ function RunMachParamFromSWCalc.Exec()
             EgtEmptyGroup( nResultLayerId)
             return
          end
-         
+         -- passo al layer successivo
          nLayerIndex = nLayerIndex + 1
          nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex)
       end
       if nMaxIndex < nLayerIndex then nMaxIndex = nLayerIndex end
+      -- passo al pezzo successivo
       nPartId = EgtGetNextPart( nPartId)
       ::continue::
    end

LuaLibs/RunPrepareExport.lua

@@ -0,0 +1,200 @@
+-- RunPrepareExport.lua by Egaltech s.r.l. 2023/10/19
+-- Creo le geometrie da esportare con 3dm
+
+-- Tabella per definizione modulo
+local RunPrepareExport = {}
+
+-- Intestazioni
+require( 'EgtBase')
+
+EgtOutLog( ' RunPreprareExport started', 1)
+
+-- Dati
+local AMD = require( 'AddManData')
+
+------------------------------------------------------------------
+local function CalcCurves( nSliceId, nDestGrp, vtSlicing, dStrandBase)
+   
+   -- scorro tutti i gruppi di curve
+   local vCrvs = EgtGetNameInGroup( nSliceId, CONTOUR_GRP .. '*')
+   for j = 1, #vCrvs do
+      -- cerco il gruppo del toolpath
+      local nTPath = EgtGetFirstNameInGroup( vCrvs[j], TOOLPATH_GRP)
+      if nTPath then
+         local nId = EgtGetFirstInGroup( nTPath)
+         while nId do
+            -- se non è wipe creo la fat curve da estrudere per creare il solido
+            local nType = EgtGetInfo( nId, KEY_TYPE, 'i')
+            if nType ~= TYPE.WIPE then
+               local dStrand = EgtGetInfo( nId, KEY_CRV_STRAND, 'd') or dStrandBase
+               
+               -- calcolo fat curve a partire da una copia della curva ( in questo modo nel DB geometrico non restano
+               -- salvati i diagrammi di Voronoi che non servono per conti futuri)
+               local nCopy = EgtCopyGlob( nId, nDestGrp)
+               local nCrv, nCnt = EgtCurveGetFatCurve( nCopy, nDestGrp, 0.5 * dStrand, false)
+               -- se fallisce ritento con valore leggermente diverso
+               if not nCrv or nCnt == 0 then
+                  nCrv, nCnt = EgtCurveGetFatCurve( nCopy, nDestGrp, 0.5 * dStrand - 0.05, false)
+               end
+               EgtErase( nCopy)
+                 
+               if nCrv and nCnt > 0 then
+                  -- se sono curve chiuse piccoli aggistamenti per creare un percorso unico
+                  if nCnt > 1 then
+                     for nLoopId = nCrv + 1, nCrv + nCnt - 1 do
+                        EgtInvertCurve( nLoopId)
+                        local dLen = EgtCurveLength( nLoopId)
+                        local dPar1 = EgtCurveParamAtLength( nLoopId, dLen * 0.5)
+                        local dPar2 = EgtCurveParamAtLength( nLoopId, dLen * 0.5 + 2 * GEO.EPS_SMALL)
+                        local ptM = EgtUP( nLoopId, dPar1)
+                        local ptM2 = EgtUP( nLoopId, dPar2)
+                        local _, _, dParRef1 = EgtPointCurveDist( ptM, nCrv)
+                        local _, _, dParRef2 = EgtPointCurveDist( ptM, nCrv)
+                        EgtTrimCurveStartEndAtParam( nCrv, dParRef2, dParRef1)
+                        EgtTrimCurveStartEndAtParam( nLoopId, dPar2, dPar1)
+                        EgtInvertCurve( nLoopId)
+                        EgtAddCurveCompoLine( nCrv, EgtSP( nLoopId))
+                        EgtAddCurveCompoCurve( nCrv, nLoopId)
+                        EgtCloseCurveCompo( nCrv)
+                     end
+                  end
+                  
+                  if nType == TYPE.OUTER_SHELL or nType == TYPE.EXTRA_OUTER_SHELL then 
+                     EgtSetColor( nCrv, EgtStdColor( 'TEAL'))
+                  elseif nType == TYPE.INNER_SHELL or nType == TYPE.EXTRA_SHELL then
+                     EgtSetColor( nCrv, EgtStdColor( 'ORANGE'))
+                  elseif nType == TYPE.LINK then
+                     EgtSetColor( nCrv, EgtStdColor( 'GRAY'))
+                  elseif nType == TYPE.INFILL then
+                     EgtSetColor( nCrv, EgtStdColor( 'YELLOW'))
+                  elseif nType == TYPE.COASTING then
+                     EgtSetColor( nCrv, EgtStdColor( 'BLUE'))
+                  elseif nType == TYPE.RIB then
+                     EgtSetColor( nCrv, EgtStdColor( 'OLIVE'))
+                  elseif nType == TYPE.AUX_SOLID then
+                     EgtSetColor( nCrv, EgtStdColor( 'AQUA'))
+                  end
+               end
+            end
+            
+            nId = EgtGetNext( nId)
+         end
+      end
+
+      -- copio le frecce direzione dal gruppo dei solidi
+      local nSolidGrp = EgtGetFirstNameInGroup( vCrvs[j], SOLID_GRP)
+      if nSolidGrp then
+         local nId = EgtGetFirstNameInGroup( nSolidGrp, DIR_ARROW)
+         while nId do
+            local nCopy = EgtCopyGlob( nId, nDestGrp)
+            EgtSetMode( nCopy, GDB_MD.STD)
+            EgtSetStatus( nCopy, GDB_ST.ON)
+            nId = EgtGetNextName( nId, DIR_ARROW)
+         end
+      end
+   end
+end
+
+------------------------------------------------------------------
+local function CalcSpiralVase( nSliceId, nDestGrp)
+   
+   -- scorro tutti i gruppi di curve
+   local vCrvs = EgtGetNameInGroup( nSliceId, CONTOUR_GRP .. '*')
+   for j = 1, #vCrvs do
+      -- recupero il solido dal gruppo
+      local nSolidGrp = EgtGetFirstNameInGroup( vCrvs[j], SOLID_GRP)
+      if nSolidGrp then
+         local vSolids = EgtGetAllInGroup( nSolidGrp)
+         for i = 1, #vSolids do
+            EgtCopyGlob( vSolids[i], nDestGrp)
+         end
+      end
+   end
+end
+
+------------------------------------------------------------------
+function RunPrepareExport.Exec()
+
+   local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. '*')
+   if not nPartId then 
+      EgtOutBox( 'Error : no part', 'Export')
+      return GDB_ID.NULL
+   end
+   
+   -- creo o recupero il gruppo per l'esportazione
+   local nGrp = EgtGetFirstNameInGroup( GDB_ID.ROOT, LAY_EXPORT)
+   if not nGrp then
+      -- se non esiste creo il gruppo
+      nGrp = EgtGroup( GDB_ID.ROOT)
+      EgtSetName( nGrp, LAY_EXPORT)
+      EgtSetStatus( nGrp, GDB_ST.OFF)
+      EgtSetLevel( nGrp, GDB_LV.TEMP)
+   else
+      -- se il gruppo esiste già non devo fare nulla
+      return nGrp
+   end
+   
+   -- creo il punto di origine del riferimento
+   local ptRef = EgtGetInfo( nPartId, KEY_ORIG_REF, 'p')
+   if not ptRef then
+      local nFrameId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( nPartId, LAY_FRAME), FRAME_PART)
+      ptRef = EgtSP( nFrameId or GDB_ID.NULL, GDB_ID.ROOT)
+   end
+   local nPnt = EgtPoint( nGrp, ptRef, GDB_RT.GLOB)
+   EgtSetName( nPnt, KEY_ORIG_REF)
+   EgtSetStatus( nPnt, GDB_ST.OFF)
+   
+   -- recupero alcune info utili e le assegno al punto per poterle leggere da ThreeJS
+   local dH = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd')
+   EgtSetInfo( nPnt, KEY_SLICE_STEP, dH)
+   local vtSlicing = EgtGetInfo( nPartId, KEY_SLICING_DIR, 'v')
+   EgtSetInfo( nPnt, KEY_SLICING_DIR, vtSlicing)
+   local bSpiralVase = EgtGetInfo( nPartId, KEY_SPIRAL_VASE, 'b') or false
+   EgtSetInfo( nPnt, KEY_SPIRAL_VASE, bSpiralVase)
+   
+   -- recupero lo strand dai parametri generale nel caso non fosse definito sulle singole curve
+   local dStrandBase = EgtGetInfo( nPartId, KEY_STRAND, 'd') or 0
+   
+   -- recupero gli slices
+   local vSlices = EgtGetNameInGroup( nPartId, SLICE_LAYER .. '*') or {}
+   if #vSlices == 0 then
+      EgtOutBox( 'Error : no slices', 'Export')
+      return GDB_ID.NULL
+   end
+   
+   -- verifico che nel primo slice siano presenti sia i toolpath sia i solidi
+   local nCrvGrp = EgtGetFirstNameInGroup( vSlices[1], CONTOUR_GRP .. '*')
+   if not nCrvGrp then
+      EgtOutBox( 'Error : no toolpaths', 'Export')
+      return GDB_ID.NULL
+   end
+   local nTPath = EgtGetFirstNameInGroup( nCrvGrp, TOOLPATH_GRP)
+   if not nTPath then
+      EgtOutBox( 'Error : no toolpaths', 'Export')
+      return GDB_ID.NULL
+   end
+   local nSolid = EgtGetFirstNameInGroup( nCrvGrp, SOLID_GRP)
+   if not nSolid then
+       EgtOutBox( 'Error : no solids', 'Export')
+      return GDB_ID.NULL
+   end
+
+   for i = 1, #vSlices do
+     
+      -- creo il gruppo corrispondente
+      local nDestGrp = EgtGroup( nGrp)
+      EgtSetName( nDestGrp, EgtGetName( vSlices[i]))
+      EgtSetStatus( nDestGrp, GDB_ST.OFF)
+      
+      if bSpiralVase then
+         CalcSpiralVase( vSlices[i], nDestGrp)
+      else
+         CalcCurves( vSlices[i], nDestGrp, vtSlicing, dStrandBase)
+      end
+   end
+   
+   return nGrp
+end
+
+---------------------------------------------------------------------
+return RunPrepareExport

LuaLibs/RunSlicing.lua

@@ -79,6 +79,13 @@ local function RemoveOldSlices( nPartId)
       EgtErase( nInfillId)
       nInfillId = EgtGetFirstNameInGroup( nPartId, INFILL_GRP .. '*')
    end
+   
+   -- rimuovo gruppo per export
+   local nExportGrpId = EgtGetFirstNameInGroup( GDB_ID.ROOT, LAY_EXPORT)
+   if nExportGrpId then
+      EgtErase( nExportGrpId)
+   end
+   
 end
 
 ---------------------------------------------------------------------

PrepareExport.lua

@@ -0,0 +1,17 @@
+-- PrepareExport.lua by Egaltech s.r.l. 2023/10/19
+-- Creo le geometrie da esportare con 3dm
+
+-- Intestazioni
+require( 'EgtBase')
+_ENV = EgtProtectGlobal()
+EgtEnableDebug( false)
+
+-- Imposto direttorio libreria specializzata per Stampa 3d
+EgtAddToPackagePath( PRINT.BASEDIR .. '\\LuaLibs\\?.lua')
+
+-- Librerie
+_G.package.loaded.RunPrepareExport = nil
+local RPE = require( 'RunPrepareExport')
+
+-- Calcolo
+PRINT.EXPORTLAYER = RPE.Exec()

Version.lua

@@ -1,4 +1,4 @@
--- Version.lua by Egaltech s.r.l. 2023/08/28
+-- Version.lua by Egaltech s.r.l. 2024/05/06
 -- Gestione della versione di 3dPrinting
 
-VERSION = '2.5h1'
+VERSION = '2.6e1'