From e2b324fe9d0b16110531f02e5b10a33205d49a5c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 8 Oct 2019 18:28:12 +0000 Subject: [PATCH] DataBeam : - aggiunta gestione svuotature con lati aperti in LapJoint e assimilate. --- LuaLibs/ProcessDtTenon.lua | 2 +- LuaLibs/ProcessLapJoint.lua | 8 +++++--- LuaLibs/ProcessMortise.lua | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/LuaLibs/ProcessDtTenon.lua b/LuaLibs/ProcessDtTenon.lua index 357f69f..7677a98 100644 --- a/LuaLibs/ProcessDtTenon.lua +++ b/LuaLibs/ProcessDtTenon.lua @@ -1,4 +1,4 @@ --- ProcessTenon.lua by Egaltech s.r.l. 2019/09/27 +-- ProcessTenon.lua by Egaltech s.r.l. 2019/10/08 -- Gestione calcolo tenone a coda di rondine per Travi -- Tabella per definizione modulo diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua index 5359107..f8103d3 100644 --- a/LuaLibs/ProcessLapJoint.lua +++ b/LuaLibs/ProcessLapJoint.lua @@ -1,5 +1,6 @@ --- ProcessLapJoint.lua by Egaltech s.r.l. 2019/10/05 +-- ProcessLapJoint.lua by Egaltech s.r.l. 2019/10/08 -- Gestione calcolo mezzo-legno per Travi +-- 2019/10/08 Agg. gestione OpenPocket. -- Tabella per definizione modulo local ProcessLapJoint = {} @@ -630,9 +631,10 @@ local function MakeMoreFaces( Proc, nPhase, nRawId, nPartId) end end -- recupero la lavorazione + local sMchFind = EgtIf( Proc.Fct <= 3, 'OpenPocket', 'Pocket') local dDiam = min( dH, dV) - EgtOutLog( 'Mortise Find Diam =' .. EgtNumToString( dDiam)) - local sPocketing = ML.FindPocketing( 'Mortise', dDiam, dFacElev) + --EgtOutLog( 'Mortise Find Diam =' .. EgtNumToString( dDiam)) + local sPocketing = ML.FindPocketing( sMchFind, dDiam, dFacElev) -- se non trova una svuotatura adatta if not sPocketing then -- verifico se due o tre facce a L con una faccia di terminazione diff --git a/LuaLibs/ProcessMortise.lua b/LuaLibs/ProcessMortise.lua index bb8f18e..7e8b5f3 100644 --- a/LuaLibs/ProcessMortise.lua +++ b/LuaLibs/ProcessMortise.lua @@ -1,4 +1,4 @@ --- ProcessMortise.lua by Egaltech s.r.l. 2019/08/27 +-- ProcessMortise.lua by Egaltech s.r.l. 2019/10/08 -- Gestione calcolo mortase per Travi -- Tabella per definizione modulo @@ -70,7 +70,7 @@ function ProcessMortise.Make( Proc, nPhase, nRawId, nPartId) local _, dCenElev = BL.GetPointDirDepth( nPartId, ptC, vtN) dMorH = max( dMorH, dCenElev or 0) -- recupero la lavorazione - local sPocketing = ML.FindPocketing( 'Mortise', 30) + local sPocketing = ML.FindPocketing( 'Pocket', 30) if not sPocketing then local sErr = 'Error on process ' .. tostring( Proc.Id) .. ' pocketing not found in library' EgtOutLog( sErr)