3dPrinting 2.6b1 :

- aggiornata versione.

Compile.bat

@@ -11,9 +11,11 @@ REM Compilazione 32 e 64 bit
 \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

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,8 @@ 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"
 
 -- Regioni con diverso numero di passate
 KEY_SHELL_NBR_DIFF = "ShellNbrDifference"
@@ -196,6 +202,8 @@ KEY_PREV_CRV = "PrevCrv"
 KEY_NEXT_CRVS = "NextCrvs"
 KEY_CRV_STRAND = "CurveStrand"
 KEY_LAYER_CNT = "LayerCnt"
+KEY_CRV_OFFSET = "CurveOffset"
+KEY_ORIG_REF = "Orig"
 
 SLICING_TYPE = {
    VERTICAL = 1,
@@ -288,6 +296,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

@@ -120,6 +120,7 @@ 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)
   
    return RibParam
 end
@@ -1040,17 +1041,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,7 @@ 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 function GetLayerParamsForToolPathCalc()
@@ -83,7 +83,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 +95,32 @@ 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)
+   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
+                  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))
+                  end
+               end
+            end
+         end
+      end
    end
-   
-   return ptE
 end
 
 -------------------------------------------------------------------
@@ -131,7 +142,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 +151,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 +315,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,7 +374,8 @@ 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
@@ -451,14 +468,13 @@ 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)
       end
       
       if nWipeId then
-         local dStrand = EgtGetInfo( nCrvId, KEY_CRV_STRAND, 'd')
          EgtSetName( nWipeId, WIPE_CRV)
          EgtSetInfo( nWipeId, KEY_TYPE, TYPE.WIPE)
          EgtSetInfo( nWipeId, KEY_CRV_STRAND, dStrand)
@@ -1332,7 +1348,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
@@ -1556,7 +1584,7 @@ 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
@@ -1651,7 +1679,7 @@ 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)
@@ -1689,6 +1717,14 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
       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'))
       
@@ -1723,7 +1759,7 @@ 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][1], KEY_SPLIT_AFTER_TRIM, '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
@@ -1860,7 +1896,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
@@ -1883,9 +1920,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
@@ -1893,7 +1936,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)
             
@@ -1905,7 +1948,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
@@ -1937,15 +1980,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
@@ -1978,11 +2029,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)

LuaLibs/RunCalcSolids.lua

@@ -21,6 +21,7 @@ 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
 
@@ -154,7 +155,11 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
          return nil
       end
    end
+
    local nSrfId = EgtSurfTmBySewing( nSolidGrp, vSurfs)
+   if not nSrfId then
+     nSrfId = EgtSurfTmByTriangles( nSolidGrp, vSurfs)
+   end
   
    -- creazione del mezzo disco iniziale
    local nCap1 = CreateSpiralVaseCap( nSectId, - vtS, nSolidGrp)
@@ -165,7 +170,7 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
    -- cancello le curve usate per la costruzione
    EgtErase( nGrpTmp)
 
-   return EgtSurfTmBySewing( nSolidGrp, { nSrfId, nCap1, nCap2})
+   return EgtSurfTmBySewing( nSolidGrp, { nSrfId, nCap1, nCap2}) or EgtSurfTmByTriangles( nSolidGrp, { nSrfId, nCap1, nCap2})
 end
 
 ----------------------------------------------------------------------
@@ -185,6 +190,36 @@ 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 CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams, nLayer)
   
@@ -207,7 +242,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 +259,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
@@ -304,6 +345,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 +385,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 +435,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
@@ -126,44 +126,6 @@ function RunMachParamFromSWCalc.Exec()
             end
             nCrvId = EgtGetNextName( nCrvId, CONTOUR_GRP .. '*')
          end
-
-
-         -- -- rimuovo eventuale info precedente del tempo di attesa
-         -- EgtRemoveInfo( nLayerId, KEY_WAITING_TIME)
-         -- -- calcolo lunghezza totale del layer
-         -- local dTotLayerLength = 0
-         -- local dTotLayerLengthForMass = 0
-         -- local dTotLayerArea = 0
-         -- local nCrvId = EgtGetFirstNameInGroup( nLayerId, CONTOUR_GRP .. '*')
-         -- while nCrvId do
-         --    local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP)
-         --    -- sommo lunghezze percorsi
-         --    local dTotCrvLength = 0
-         --    local dTotCrvLengthForMass = 0
-         --    local nShellId = EgtGetFirstInGroup( nToolPathId)
-         --    while nShellId do
-         --       dTotCrvLength = dTotCrvLength + EgtCurveLength( nShellId)
-         --       if EgtGetName( nShellId) ~= WIPE_CRV then
-         --          dTotCrvLengthForMass = dTotCrvLengthForMass + EgtCurveLength( nShellId)
-         --       end
-         --       nShellId = EgtGetNext( nShellId)
-         --    end
-         --    dTotLayerLength = dTotLayerLength + dTotCrvLength
-         --    dTotLayerLengthForMass = dTotLayerLengthForMass + dTotCrvLengthForMass
-         --    -- recupero area
-         --    local nOuterCrvId = EgtGetFirstNameInGroup( nCrvId, OUTER_CRV)
-         --    if nOuterCrvId and dStrandCount > 0.5 then
-         --       local _, _, dTotCrvArea = EgtCurveArea( nOuterCrvId)
-         --       local dOuterLength = EgtCurveLength( nOuterCrvId)
-         --       -- recupero offset del part per aggiungerlo all'area interna
-         --       local dOffset = EgtGetInfo( nPartId, KEY_OFFSET_SLICE, 'd')
-         --       dTotCrvArea = dTotCrvArea + ( dOffset * dOuterLength)
-         --       dTotLayerArea = dTotLayerArea + dTotCrvArea
-         --    end
-         --    nCrvId = EgtGetNextName( nCrvId, CONTOUR_GRP .. '*')
-         -- end
-
-
          -- recupero feed del layer
          local dLayerFeed = 0
          local dLayerWait = 0
@@ -192,12 +154,11 @@ function RunMachParamFromSWCalc.Exec()
          for nMeanIndex = 1, #LengthCrvList do
             dStrandMean = dStrandMean + LengthCrvList[nMeanIndex].Width * LengthCrvList[nMeanIndex].Length
          end
-         dStrandMean = dStrandMean / dTotLayerLength
+         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
@@ -216,9 +177,9 @@ function RunMachParamFromSWCalc.Exec()
          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 / dTMax * 60
-         local dFTrg = dTotLayerLength / dTTrg * 60
-         local dFMax = dTotLayerLength / dTMin * 60
+         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
@@ -241,8 +202,10 @@ 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 / ( ( dStrandMean - 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
@@ -276,15 +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_FTRG, dFTrg)
          EgtSetInfo( nLayerResultId, KEY_FMAX, dFeedMax)
-         -- EgtSetInfo( nLayerResultId, KEY_FMIN, dFMin)
-         -- EgtSetInfo( nLayerResultId, KEY_FTRG, dFTrg)
-         -- EgtSetInfo( nLayerResultId, KEY_FMAX, dFMax)
          EgtSetInfo( nLayerResultId, KEY_TCUR, dLayerTime)
          EgtSetInfo( nLayerResultId, KEY_FCUR, dLayerFeed)
          EgtSetInfo( nLayerResultId, KEY_LENGTH, dTotLayerLength)
@@ -296,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/10/02
+-- Version.lua by Egaltech s.r.l. 2024/02/13
 -- Gestione della versione di 3dPrinting
 
-VERSION = '2.5j1'
+VERSION = '2.6b1'