From 2f4a77c73e5a56f0801d75bd35cb518f87c9e460 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Tue, 10 Sep 2024 18:12:47 +0200 Subject: [PATCH] =?UTF-8?q?-=20in=20FacesBySaw=20si=20invertono=20gli=20ac?= =?UTF-8?q?corciamenti=20solo=20se=20l'inversione=20del=20percorso=20non?= =?UTF-8?q?=20=C3=A8=20forzata=20dall'esterno;=20adeguati=20HeadCut=20e=20?= =?UTF-8?q?Split?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LuaLibs/FacesBySaw.lua | 5 ++++- LuaLibs/ProcessHeadCut.lua | 4 ++-- LuaLibs/ProcessSplit.lua | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/LuaLibs/FacesBySaw.lua b/LuaLibs/FacesBySaw.lua index 82812cc..a92a874 100644 --- a/LuaLibs/FacesBySaw.lua +++ b/LuaLibs/FacesBySaw.lua @@ -283,7 +283,10 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw if bInvert then ptP1, ptP2 = ptP2, ptP1 vtV1, vtV2 = vtV2, vtV1 - dAccStart, dAccEnd = dAccEnd, dAccStart + -- se l'inversione รจ forzata dall'esterno, anche gli accorciamenti che arrivano dall'esterno si prendono per buoni + if bForceInvert == nil then + dAccStart, dAccEnd = dAccEnd, dAccStart + end end local vtTg = ptP2 - ptP1 ; vtTg:normalize() local dAllStart = 0 diff --git a/LuaLibs/ProcessHeadCut.lua b/LuaLibs/ProcessHeadCut.lua index a805c87..99557a2 100644 --- a/LuaLibs/ProcessHeadCut.lua +++ b/LuaLibs/ProcessHeadCut.lua @@ -252,7 +252,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut if not bOk then return false, sErr end end -- taglio verticale - local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, '', b3Raw) + local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, '', b3Raw, true) if not bOk then return bOk, sErr end end return true, sWarn @@ -290,7 +290,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut if i == 1 and HeadCutType.sType =='Precut' then dCutOffset = dStartOffset end - local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, '', b3Raw) + local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, '', b3Raw, true) if not bOk then return false, sErr end end -- altrimenti necessari tagli da sopra e sotto con testa opportuna diff --git a/LuaLibs/ProcessSplit.lua b/LuaLibs/ProcessSplit.lua index c5dc662..36edfbc 100644 --- a/LuaLibs/ProcessSplit.lua +++ b/LuaLibs/ProcessSplit.lua @@ -438,7 +438,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut if i == 1 and TailCutType.sType ~= 'Precut' then sInfo = 'Cut' end - local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, sInfo, b3Raw) + local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, sInfo, b3Raw, true) if not bOk then return false, sErr end end return true, sWarn @@ -488,7 +488,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut if i == nCuts and TailCutType.bHorizCut and BD.C_SIMM and not BD.DOWN_HEAD then sNotes = EgtSetValInNotes( sNotes, 'StartZmax', 2) end - local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, sNotes, b3Raw) + local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, sNotes, b3Raw, true) if not bOk then return false, sErr end end -- altrimenti necessari tagli da sopra e sotto con testa opportuna