From 777ba74e4df880671b8230a822f2e3eadc4a4773 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Thu, 3 Apr 2025 15:28:31 +0200 Subject: [PATCH] =?UTF-8?q?-=20In=20FBS=20errore=20'TwoFacesBySaw=20from?= =?UTF-8?q?=20bottom=20impossible'=20solo=20se=20entrambe=20le=20facce=20n?= =?UTF-8?q?on=20sono=20ok=20-=20In=20LapJoint,=20si=20controlla=20direzion?= =?UTF-8?q?e=20faccia=201=20e=20larghezza=20faccia=202=20(e=20reciproci)?= =?UTF-8?q?=20per=20capire=20se=20si=20pu=C3=B2=20lavorare=20con=20lama=20?= =?UTF-8?q?testa=20sotto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LuaLibs/FacesBySaw.lua | 2 +- LuaLibs/ProcessLapJoint.lua | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/LuaLibs/FacesBySaw.lua b/LuaLibs/FacesBySaw.lua index 2aa124b..20c0798 100644 --- a/LuaLibs/FacesBySaw.lua +++ b/LuaLibs/FacesBySaw.lua @@ -643,7 +643,7 @@ function FacesBySaw.MakeTwo( Proc, nPhase, nRawId, nPartId, dOvmHead, sCutType, local bFaceOk = {} bFaceOk[1] = ( vtN[1]:getZ() >= ( BD.CUT_VZ_MIN or BD.NZ_MINB) or abs( vtN[1]:getY()) < 0.174 or ( Proc.AffectedFaces.Left ~= Proc.AffectedFaces.Right and Proc.Face[1].Elevation < dMaxDepth - 10 * GEO.EPS_SMALL)) bFaceOk[2] = ( vtN[2]:getZ() >= ( BD.CUT_VZ_MIN or BD.NZ_MINB) or abs( vtN[2]:getY()) < 0.174 or ( Proc.AffectedFaces.Left ~= Proc.AffectedFaces.Right and Proc.Face[2].Elevation < dMaxDepth - 10 * GEO.EPS_SMALL)) - if not bDownHead and ( not bFaceOk[1] or not bFaceOk[2]) then + if not bDownHead and not bFaceOk[1] and not bFaceOk[2] then local sErr = 'Error : TwoFacesBySaw from bottom impossible' EgtOutLog( sErr) return false, sErr diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua index dbc2862..21a0015 100644 --- a/LuaLibs/ProcessLapJoint.lua +++ b/LuaLibs/ProcessLapJoint.lua @@ -7088,11 +7088,9 @@ local function TestTwoFacesDownHead( Proc) if not ( Proc.Face[1].IsTooDownwardForTopBlade or Proc.Face[2].IsTooDownwardForTopBlade) then bDownHeadBlade = false else - for i = 1, Proc.Fct do - if Proc.Face[i].IsTooDownwardForTopBlade and ( not Proc.IsTopDownRabbet or Proc.Face[i].IsTooWideForTopBlade) then - bDownHeadBlade = true - break - end + if ( Proc.Face[1].IsTooDownwardForTopBlade and Proc.Face[2].IsTooWideForTopBlade) or + ( Proc.Face[2].IsTooDownwardForTopBlade and Proc.Face[1].IsTooWideForTopBlade) then + bDownHeadBlade = true end end end