From d343e36e77aa38c73c98d75d79b715861b30797b Mon Sep 17 00:00:00 2001 From: SaraP Date: Mon, 2 Oct 2023 14:20:42 +0200 Subject: [PATCH] 3dPrinting : - corretto errore ingressi e uscite setti. --- LuaLibs/CalcToolPath.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/LuaLibs/CalcToolPath.lua b/LuaLibs/CalcToolPath.lua index d856ca6..aa8e724 100644 --- a/LuaLibs/CalcToolPath.lua +++ b/LuaLibs/CalcToolPath.lua @@ -1397,12 +1397,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 +1483,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