3dPrinting :

- ripristinata scrittura feed in toolpath.

LuaLibs/CalcToolPath.lua

@@ -458,9 +458,10 @@ local function AddRetraction( nCrvId, vtSlicing, dCoastingLen, dWipeLen, dWipeDi
       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, 0)
+         EgtSetInfo( nWipeId, KEY_CRV_STRAND, dStrand)
          EgtSetColor( nWipeId, EgtStdColor('AQUA'))
       end
    end
@@ -1397,12 +1398,11 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
    local nRibLoc = EgtCopyGlob( nRibId, nGrpTmp)
    local vtDir = EgtMV( nRibLoc)
    local dParCrv = 1
-   local dTol = 10 * GEO.EPS_SMALL
    for dParCrv = 1, dParE do
       local vtS = EgtUV( nLeadLoc, dParCrv - 1, 1)
       local vtE = EgtUV( nLeadLoc, dParCrv, -1)
-      local dTol = 10 * GEO.EPS_SMALL
-      if AreSameVectorApprox( vtS, vtE) and vtS * vtDir < - 1 + GEO.EPS_SMALL then
+      local dLenCrv = EgtCurveCompoLength( nLeadLoc, dParCrv - 1)
+      if AreSameVectorApprox( vtS, vtE) and vtS * vtDir < - 1 + GEO.EPS_SMALL and dLenCrv > dStrand + GEO.EPS_SMALL then
          local dDist = EgtPointCurveDist( EgtUP( nLeadLoc, dParCrv - 0.5), nRibLoc)
          EgtCopyGlob( nLeadLoc, nGrpTmp)
          if dDist < dStrand + GEO.EPS_SMALL then
@@ -1484,7 +1484,9 @@ local function FindCorrectRibLead( dPar, nRib, nCrvOffs, bLeadInvert, dLeadLen,
          nOtherRib = EgtIf( bInVsOut, EgtGetNext( nLinkId), EgtGetPrev( nLinkId))
          local nOrigRib1 = EgtGetInfo( nRib, KEY_ORIGINAL_RIB, 'i')
          local nOrigRib2 = EgtGetInfo( nOtherRib, KEY_ORIGINAL_RIB, 'i')
-         if nOrigRib1 ~= nOrigRib2 then
+         local nSplitId1 = EgtGetInfo( nRib, KEY_SPLIT_ID, 'i') or 0
+         local nSplitId2 = EgtGetInfo( nOtherRib, KEY_SPLIT_ID, 'i') or 0
+         if nOrigRib1 ~= nOrigRib2 or ( nOrigRib1 == nOrigRib2 and nSplitId1 ~= nSplitId2) then
             nOtherRib = nil
          end
       end
@@ -1656,7 +1658,7 @@ local function AddRibsLeadOut( nCrv, nLoopsGrp, vtSlicing, nGrpTmp, bForceNoSoli
                   EgtRelocateGlob( nWipe, nCoasting or nCrvLO or nCrv, GDB_IN.AFTER)
                   EgtSetName( nWipe, WIPE_CRV)
                   EgtSetInfo( nWipe, KEY_TYPE, TYPE.WIPE)
-                  EgtSetInfo( nWipe, KEY_CRV_STRAND, 0)
+                  EgtSetInfo( nWipe, KEY_CRV_STRAND, dStrand)
                   EgtSetColor( nWipe, EgtStdColor('AQUA'))
                end
             end

LuaLibs/RunMachParamFromSWCalc.lua

@@ -266,7 +266,7 @@ function RunMachParamFromSWCalc.Exec()
          nCrvId = EgtGetFirstNameInGroup( nLayerId, CONTOUR_GRP .. '*')
          while nCrvId do
             local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) or GDB_ID.NULL
-            -- EgtSetInfo( nToolPathId, KEY_FEED, dLayerFeed)
+            EgtSetInfo( nToolPathId, KEY_FEED, dLayerFeed)
             EgtSetInfo( nToolPathId, KEY_SPEED, dSpeed)
             nCrvId = EgtGetNextName( nCrvId, CONTOUR_GRP .. '*')
          end

Version.lua

@@ -1,4 +1,4 @@
--- Version.lua by Egaltech s.r.l. 2023/08/28
+-- Version.lua by Egaltech s.r.l. 2023/10/02
 -- Gestione della versione di 3dPrinting
 
-VERSION = '2.5i1'
+VERSION = '2.5j1'