3dPrinting 2.6f1 :

- correzione nell'unione delle curve per esportazione 3dm.

.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

Compile.bat

@@ -1,21 +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\RunPrepareExport.lua              LuaLibs\RunPrepareExport.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\PrepareExport.lua                         PrepareExport.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

@@ -140,6 +140,8 @@ 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"
@@ -204,6 +206,7 @@ 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,

LuaLibs/CalcPaths.lua

@@ -184,6 +184,7 @@ local function GetPathsFromSurf( nSrfId, sName, nType, nGrpId, vPtStart)
       for nInd = 0, nCrvCnt - 1 do
          EgtSetName( nCrvId + nInd, sName)
          EgtSetInfo( nCrvId + nInd, KEY_TYPE, nType)
+         EgtModifyCurveExtrusion( nCrvId + nInd, s_vtSlicing, GDB_ID.ROOT)
          
          -- se è loop interno lo inverto per averlo orientato in senso antiorario 
          if nInd > 0 then
@@ -2144,6 +2145,8 @@ local function ReassignInfo( nCrv, nCnt, vOrig)
                CopyInfo( vOrig[i], nId, KEY_RIBS_OVERLAP, 'd')
                CopyInfo( vOrig[i], nId, KEY_RIBS_TYPE, 'i')
                CopyInfo( vOrig[i], nId, KEY_RIBS_LINK, 'b')
+               CopyInfo( vOrig[i], nId, KEY_RIBS_LINK_FILLET, 'd')
+               CopyInfo( vOrig[i], nId, KEY_RIBS_LEAD_FILLET, 'd')
                bStart = true
             end
             -- verifico se corrisponde al suo end
@@ -2526,6 +2529,89 @@ end
 
 --------------------------------------------------------------------
 --------------------- RIBS-MERGED SHELLS ---------------------------
+--------------------------------------------------------------------
+local function CalcFillet( nCrv1, nCrv2, dFillet, nGrpId, nGrpTmp)
+
+   if dFillet < GEO.EPS_SMALL then return end
+   
+   -- 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( nGrpId, {nNewFillet})
+         EgtChangeId( nNewCrv, nCrv1)
+      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( nGrpId, {nNewFillet + 1})
+         EgtChangeId( nNewCrv, nCrv2)
+      end
+   else
+      EgtOutLog( 'Warning : ribs-merged shells fillet not possible (layer '..tostring( s_nCurrIdx)..') - CalcPath')
+   end
+   
+   EgtRelocateGlob( nFillet or GDB_ID.NULL, nGrpId)
+end
+
+--------------------------------------------------------------------
+local function AddFillet( nRib1, vLinks, nRib2, nGrpId)
+   
+   local dFillet1 = EgtGetInfo( nRib1, KEY_RIBS_LINK_FILLET, 'd')
+   local dFillet2 = EgtGetInfo( nRib2, KEY_RIBS_LINK_FILLET, 'd')
+   -- verifico se necessaria correzione per passate dello stesso setto
+   local nOrig1 = EgtGetInfo( nRib1, KEY_ORIGINAL_RIB, 'i')
+   local nOrig2 = EgtGetInfo( nRib2, KEY_ORIGINAL_RIB, 'i')
+   local nSplit1 = EgtGetInfo( nRib1, KEY_SPLIT_ID, 'i') or 0
+   local nSplit2 = EgtGetInfo( nRib2, KEY_SPLIT_ID, 'i') or 0
+   if nOrig1 == nOrig2 and nSplit1 == nSplit2 then
+      local dStrand = EgtGetInfo( nRib1, KEY_RIBS_STRAND, 'd')
+      dFillet1 = min( dFillet1, 0.5 * dStrand)
+      dFillet2 = dFillet1
+   end
+   
+   -- creo un gruppo con riferimento locale allo slicing per i conti del fillet
+   local nGrpTmp = EgtGroup( nGrpId, Frame3d( ORIG(), s_vtSlicing), GDB_RT.GLOB)
+   
+   -- calcolo il primo fillet
+   local ptRib1 = EgtEP( nRib1, GDB_ID.ROOT)
+   for i = 1, #vLinks do
+      if AreSamePointApprox( ptRib1, EgtSP( vLinks[i], GDB_ID.ROOT)) then
+         CalcFillet( nRib1, vLinks[i], dFillet1, nGrpId, nGrpTmp)
+         break
+      end
+   end
+   -- calcolo il secondo fillet
+   local ptRib2 = EgtSP( nRib2, GDB_ID.ROOT)
+   for i = 1, #vLinks do
+      if AreSamePointApprox( EgtEP( vLinks[i], GDB_ID.ROOT), ptRib2) then
+         CalcFillet( vLinks[i], nRib2, dFillet2, nGrpId, nGrpTmp)
+         break
+      end
+   end
+
+   EgtErase( nGrpTmp)
+end
+
 --------------------------------------------------------------------
 local function ComputeShortestLinkOnCurve( nCrv, dParS, dParE, nGrp)
    
@@ -2776,6 +2862,8 @@ local function HandleRibsIntersectionForRibsMergedShells( vOrigRibs, nRibsGrp, n
                      if nLinkId then
                         local nRes = EgtCurveWithRegionClassify( nLinkId, nShellSrf)
                         if nRes == GDB_CRC.IN then
+                           -- fillet
+                           AddFillet( nCrv, {nLinkId}, nCrv + 1, nRibsGrp)
                            EgtAddCurveCompoCurve( nCrv + 1, nLinkId, true, false)
                            EgtAddCurveCompoCurve( nCrv + 1, nCrv, true, false)
                         else
@@ -2881,6 +2969,7 @@ local function CreateRibsMergedShellLastLink( vShells, vRibs, nGrp, bInvert)
          if bInvert then
             -- conservo tratto dParS->dParE
             EgtTrimCurveStartEndAtParam( nLink, dParS, dParE)
+            EgtInvertCurve( nLink)
          else
             -- conservo tratto dParE->dParS
             EgtTrimCurveStartEndAtParam( nLink, dParE, dParS)
@@ -2923,6 +3012,8 @@ local function CreateRibsMergedShellLastLink( vShells, vRibs, nGrp, bInvert)
                            end
                         end
                         if nPartLink then
+                           -- fillet
+                           AddFillet( vRibs[i], {nPartLink}, nOtherPart, nGrp)
                            EgtAddCurveCompoCurve( vRibs[i], nPartLink)
                            EgtAddCurveCompoCurve( vRibs[i], nOtherPart)
                         end
@@ -3015,6 +3106,7 @@ local function AdjustRibsMergedExtraShellLink( nLinkId, vExtraShells, nGrp)
    
    local frLoc = Frame3d( ORIG(), s_vtSlicing)
    local nGrpLoc = EgtGroup( nGrp, frLoc)
+   local vLinks = {}
    
    -- devo conservare solo le intersezioni fra link ed extra shell
    for i = 1, #vExtraShells do
@@ -3022,6 +3114,8 @@ local function AdjustRibsMergedExtraShellLink( nLinkId, vExtraShells, nGrp)
       if nRes then
          for nId = nRes + nPntCnt, nRes + nPntCnt + nCrvCnt - 1 do
             EgtRelocateGlob( nId, nGrp)
+            EgtModifyCurveExtrusion( nId, s_vtSlicing, GDB_ID.ROOT)
+            table.insert( vLinks, nId)
          end
       end
    end
@@ -3029,6 +3123,7 @@ local function AdjustRibsMergedExtraShellLink( nLinkId, vExtraShells, nGrp)
    -- cancello il link originale
    EgtErase( nLinkId)
    EgtErase( nGrpLoc)
+   return vLinks
 end
 
 --------------------------------------------------------------------
@@ -3070,7 +3165,7 @@ local function CreateRibsMergedShellCurve( nGrp, nRibsGrp, vShells, vOrigShells,
       -- creo il link
       local nLinkId = CreateRibsMergedShellLink( nCurr, nNext, nGrp, EgtIf( bLinkOnShell, vLoopsShell, vLoopsTrim), nRibsGrp)
       if not nLinkId then
-         return false 
+         return false
       end
 
       -- se link fatto sulla shell verifico non si sovrapponga al last link 
@@ -3092,16 +3187,24 @@ local function CreateRibsMergedShellCurve( nGrp, nRibsGrp, vShells, vOrigShells,
       end
       
       -- verifico se necessari aggiustamenti per extra shell
+      local vLinks
       if bExtraShell and bLinkOnShell then
-         AdjustRibsMergedExtraShellLink( nLinkId, vOrigShells, nGrp)
+         vLinks = AdjustRibsMergedExtraShellLink( nLinkId, vOrigShells, nGrp)
       end
       
+      -- fillet
+      AddFillet( nCurr, vLinks or {nLinkId}, nNext, nGrp)
+      
    end
    
    -- eventuali aggiustamenti del last link per extra shell
+   local vLastLinks
    if bExtraShell then
-       AdjustRibsMergedExtraShellLink( nLastLink, vOrigShells, nGrp)
+      vLastLinks = AdjustRibsMergedExtraShellLink( nLastLink, vOrigShells, nGrp)
    end
+   
+   -- fillet sul last link
+   AddFillet( vRibs[#vRibs], vLastLinks or {nLastLink}, vRibs[1], nGrp)
 
    -- elimino le curve inutili e le superfici
    EgtErase( nRibsGrp)

LuaLibs/CalcSlices.lua

@@ -121,7 +121,9 @@ local function GetRibParams( nId)
    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
 

LuaLibs/CalcToolPath.lua

@@ -16,6 +16,8 @@ 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_dApproxTol = 0.1
+local s_dHSafeWipe = 2
+local s_nCurrIdx
 
 ---------------------------------------------------------------------
 local function GetLayerParamsForToolPathCalc()
@@ -97,7 +99,7 @@ local function AddZCorrection( b3Box, LayerParams)
    
    -- correzione per i wipe
    -- altezza minima necessaria per i wipe
-   local dHMinWipe = LayerParams.dTDiam / 2 * dNxy + max( dHBox, 0)
+   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.."*")
@@ -108,13 +110,23 @@ local function AddZCorrection( b3Box, LayerParams)
             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
-                  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 = ( dHMinWipe - ptE:getZ()) / vtDir:getZ()
-                     EgtTrimCurveEndAtLen( vIds[k], dLen - abs( dDiffLen))
+                  -- 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
@@ -378,19 +390,29 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
    
    -- 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)
@@ -421,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)
@@ -518,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')
@@ -530,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)
    
@@ -1040,6 +1063,78 @@ end
 
 --------------------------------------------------------------------
 --------------------------- RIBS -----------------------------------
+--------------------------------------------------------------------
+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)
 
@@ -1074,7 +1169,7 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
       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)) + GEO.EPS_SMALL then
+      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)
@@ -1116,7 +1211,7 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
             dOffs = dCurrStrand * 0.5
          else
             -- 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 - 10 * GEO.EPS_SMALL
+            dOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 50 * GEO.EPS_SMALL
          end
          
          if dOffs > GEO.EPS_SMALL then
@@ -1242,6 +1337,8 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrp
    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
@@ -1273,6 +1370,14 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrp
          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)
@@ -1286,6 +1391,7 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrp
    -- 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)
@@ -1293,6 +1399,11 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrp
       EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
       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)
@@ -1304,12 +1415,13 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrp
 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
@@ -1325,6 +1437,12 @@ local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp)
             EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB)
             EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
             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)
@@ -1402,7 +1520,7 @@ 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
@@ -1571,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
    
@@ -1589,6 +1708,8 @@ local function AddRibsLeadIn( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSolid
          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)
@@ -1608,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
@@ -1641,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)
@@ -1711,7 +1838,7 @@ 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)
@@ -1733,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)
@@ -1771,12 +1896,17 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
                if not bLoopRib then
                   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
@@ -1785,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
@@ -1830,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)
@@ -1853,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
@@ -1967,7 +2097,7 @@ local function SpiralVase( vLayIds, LayerParams)
                      local nGuideId = EgtCopyGlob( nOldPathId, nTpathGrpId)
                      -- la porto alla stessa quota del toolpath
                      EgtMove( nGuideId, vtMove + LayerParams.dLayHeight * LayerParams.vtSlicing, GDB_RT.GLOB)
-                     EgtChangeClosedCurveStartPoint( nGuideId, ptOld, GDB_RT.GLOB)
+                     EgtChangeClosedCurveStartPoint( nGuideId, ptNew, GDB_RT.GLOB)
                      
                      EgtSpiralizeCurveAlongGuide( nNewEntId, nGuideId)
                      EgtErase( nGuideId)
@@ -2039,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)
@@ -27,46 +28,32 @@ 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
 
@@ -74,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
 
@@ -105,16 +110,21 @@ 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))
+   
+   -- accorcio leggermente la curva per evitare problemi di inconsistent orientation nel solido
+   local dLen = EgtCurveLength( nCrvId)
+   EgtTrimCurveEndAtLen( nCrvId, dLen - 20 * GEO.EPS_SMALL)
    
    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)
   
@@ -141,12 +151,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)
@@ -156,10 +173,7 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
       end
    end
 
-   local nSrfId = EgtSurfTmBySewing( nSolidGrp, vSurfs)
-   if not nSrfId then
-     nSrfId = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
-   end
+   local nSrfId = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
   
    -- creazione del mezzo disco iniziale
    local nCap1 = CreateSpiralVaseCap( nSectId, - vtS, nSolidGrp)
@@ -170,14 +184,14 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
    -- cancello le curve usate per la costruzione
    EgtErase( nGrpTmp)
 
-   return EgtSurfTmBySewing( nSolidGrp, { nSrfId, nCap1, nCap2}) or EgtSurfTmByTriangles( 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
 
@@ -220,6 +234,36 @@ local function CreateDirectionArrow( nCrvId, nSolidGrp, vtSlicing, dStrand, nLay
    
 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)
   
@@ -272,44 +316,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
@@ -319,7 +361,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
@@ -334,6 +376,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)

LuaLibs/RunPrepareExport.lua

@@ -28,52 +28,56 @@ local function CalcCurves( nSliceId, nDestGrp, vtSlicing, dStrandBase)
             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
+               -- calcolo fat region 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)
+               local nSurf = EgtSurfFrFatCurve( nDestGrp, nCopy, 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)
+               if not nSurf or nSurf == GDB_ID.NULL then
+                  nSurf = EgtSurfFrFatCurve( nDestGrp, nCopy, 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)
+               if nSurf then
+                  local nChunks = EgtSurfFrChunkCount( nSurf)
+                  for k = 0, nChunks - 1 do
+                     -- estraggo i loop associati
+                     local nCrv, nCnt = EgtExtractSurfFrChunkLoops( nSurf, k, nDestGrp)
+                     -- eventuali aggiustamenti per creare un percorso unico
+                     if nCnt > 1 then
+                        for nLoopId = nCrv + 1, nCrv + nCnt - 1 do
+                           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( ptM2, nCrv)
+                           local _, _, dParRef2 = EgtPointCurveDist( ptM, nCrv)
+                           EgtTrimCurveStartEndAtParam( nCrv, dParRef2, dParRef1)
+                           EgtTrimCurveStartEndAtParam( nLoopId, dPar2, dPar1)
+                           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
-                  
-                  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
+                  EgtErase( nSurf)
                end
             end
             

Version.lua

@@ -1,4 +1,4 @@
--- Version.lua by Egaltech s.r.l. 2024/02/13
+-- Version.lua by Egaltech s.r.l. 2024/05/06
 -- Gestione della versione di 3dPrinting
 
-VERSION = '2.6b1'
+VERSION = '2.6f1'