diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua index 102ef9c..8936c44 100644 --- a/LuaLibs/BeamExec.lua +++ b/LuaLibs/BeamExec.lua @@ -1,4 +1,4 @@ --- BeamExec.lua by Egaltech s.r.l. 2021/03/14 +-- BeamExec.lua by Egaltech s.r.l. 2021/03/25 -- Libreria esecuzione lavorazioni per Travi -- 2019/07/11 Aggiunta gestione stato rotazione di feature per TS3. -- 2019/09/04 Corretto controllo feature di testa e coda con sovramateriale di testa elevato. @@ -39,78 +39,78 @@ local BD = require( 'BeamData') -- Carico le librerie _G.package.loaded.MachiningLib = nil -local BM = require( 'MachiningLib') _G.package.loaded.BeamLib = nil -local BL = require( 'BeamLib') _G.package.loaded.DiceCut = nil -local DC = require( 'DiceCut') _G.package.loaded.FacesBySaw = nil -local Fbs = require( 'FacesBySaw') _G.package.loaded.ProcessHeadCut = nil -local Hcut= require( 'ProcessHeadCut') _G.package.loaded.ProcessSplit = nil -local Split = require( 'ProcessSplit') _G.package.loaded.ProcessCut = nil -local Cut = require( 'ProcessCut') _G.package.loaded.ProcessDoubleCut = nil -local DoubleCut = require( 'ProcessDoubleCut') _G.package.loaded.ProcessLongCut = nil -local LongCut = require( 'ProcessLongCut') _G.package.loaded.ProcessLongDoubleCut = nil -local Long2Cut = require( 'ProcessLongDoubleCut') _G.package.loaded.ProcessSawCut = nil -local SawCut = require( 'ProcessSawCut') _G.package.loaded.ProcessRidgeLap = nil -local RidgeLap = require( 'ProcessRidgeLap') _G.package.loaded.ProcessLapJoint = nil -local LapJoint = require( 'ProcessLapJoint') _G.package.loaded.ProcessChamfer = nil -local Chamfer = require( 'ProcessChamfer') _G.package.loaded.ProcessDrill = nil -local Drill = require( 'ProcessDrill') _G.package.loaded.ProcessFrenchRidgeLap = nil -local FrenchRidgeLap = require( 'ProcessFrenchRidgeLap') _G.package.loaded.ProcessBlockHausFront = nil -local BlockHausFront = require( 'ProcessBlockHausFront') _G.package.loaded.ProcessTenon = nil -local Tenon = require( 'ProcessTenon') _G.package.loaded.ProcessMortise = nil -local Mortise = require( 'ProcessMortise') _G.package.loaded.ProcessDtTenon = nil -local DtTenon = require( 'ProcessDtTenon') _G.package.loaded.ProcessDtMortise = nil -local DtMortise = require( 'ProcessDtMortise') _G.package.loaded.ProcessMark = nil -local Mark = require( 'ProcessMark') _G.package.loaded.ProcessText = nil -local Text = require( 'ProcessText') _G.package.loaded.ProcessScarfJoint = nil -local ScarfJoint = require( 'ProcessScarfJoint') _G.package.loaded.ProcessSimpleScarf = nil -local Scarf = require( 'ProcessSimpleScarf') _G.package.loaded.ProcessStepJoint = nil -local StepJoint = require( 'ProcessStepJoint') _G.package.loaded.ProcessStepJointNotch = nil -local StJoNotch = require( 'ProcessStepJointNotch') _G.package.loaded.ProcessProfFront = nil -local ProfFront = require( 'ProcessProfFront') _G.package.loaded.ProcessProfConcave = nil -local ProfConcave = require( 'ProcessProfConcave') _G.package.loaded.ProcessProfConvex = nil -local ProfConvex = require( 'ProcessProfConvex') _G.package.loaded.ProcessProfCamb = nil -local ProfCamb = require( 'ProcessProfCamb') _G.package.loaded.ProcessProfHead = nil -local ProfHead = require( 'ProcessProfHead') _G.package.loaded.ProcessRoundArch = nil -local RoundArch = require( 'ProcessRoundArch') _G.package.loaded.ProcessTyroleanDovetail = nil -local TyroleanDovetail = require( 'ProcessTyroleanDovetail') _G.package.loaded.ProcessDovetail = nil -local Dovetail = require( 'ProcessDovetail') _G.package.loaded.ProcessFreeContour = nil -local FreeContour = require( 'ProcessFreeContour') _G.package.loaded.ProcessDecor = nil +local BM = require( 'MachiningLib') +local BL = require( 'BeamLib') +local DC = require( 'DiceCut') +local Fbs = require( 'FacesBySaw') +local Hcut= require( 'ProcessHeadCut') +local Split = require( 'ProcessSplit') +local Cut = require( 'ProcessCut') +local DoubleCut = require( 'ProcessDoubleCut') +local LongCut = require( 'ProcessLongCut') +local Long2Cut = require( 'ProcessLongDoubleCut') +local SawCut = require( 'ProcessSawCut') +local RidgeLap = require( 'ProcessRidgeLap') +local LapJoint = require( 'ProcessLapJoint') +local Chamfer = require( 'ProcessChamfer') +local Drill = require( 'ProcessDrill') +local FrenchRidgeLap = require( 'ProcessFrenchRidgeLap') +local BlockHausFront = require( 'ProcessBlockHausFront') +local Tenon = require( 'ProcessTenon') +local Mortise = require( 'ProcessMortise') +local DtTenon = require( 'ProcessDtTenon') +local DtMortise = require( 'ProcessDtMortise') +local Mark = require( 'ProcessMark') +local Text = require( 'ProcessText') +local ScarfJoint = require( 'ProcessScarfJoint') +local Scarf = require( 'ProcessSimpleScarf') +local StepJoint = require( 'ProcessStepJoint') +local StJoNotch = require( 'ProcessStepJointNotch') +local ProfFront = require( 'ProcessProfFront') +local ProfConcave = require( 'ProcessProfConcave') +local ProfConvex = require( 'ProcessProfConvex') +local ProfCamb = require( 'ProcessProfCamb') +local ProfHead = require( 'ProcessProfHead') +local RoundArch = require( 'ProcessRoundArch') +local TyroleanDovetail = require( 'ProcessTyroleanDovetail') +local Dovetail = require( 'ProcessDovetail') +local FreeContour = require( 'ProcessFreeContour') local Decor = require( 'ProcessDecor') EgtOutLog( ' BeamExec started', 1) diff --git a/LuaLibs/ProcessHeadCut.lua b/LuaLibs/ProcessHeadCut.lua index fd64b83..e99dc48 100644 --- a/LuaLibs/ProcessHeadCut.lua +++ b/LuaLibs/ProcessHeadCut.lua @@ -1,4 +1,4 @@ --- ProcessSplit.lua by Egaltech s.r.l. 2021/03/02 +-- ProcessSplit.lua by Egaltech s.r.l. 2021/03/25 -- Gestione calcolo tagli di testa per Travi -- Tabella per definizione modulo @@ -170,9 +170,9 @@ function ProcessHeadCut.Make( Proc, nPhase, nRawId, nPartId, dOvmHead, bNeedHCut local dMaxVertDepth = dMaxDepth - ( BD.DECR_VERT_CUT or 0) -- caratteristiche taglio local bHorizCut = ( b3Raw:getDimY() > b3Raw:getDimZ() + 10 * GEO.EPS_SMALL and b3Raw:getDimZ() < dMaxVertDepth - BD.CUT_EXTRA) - local dDimYRef = EgtIf( b3Raw:getDimZ() < BD.MIN_DIM_HBEAM + 10 * GEO.EPS_SMALL, dMaxDepth - BD.CUT_EXTRA, BD.MAX_DIM_HTCUT_HBEAM) + local dDimYRef = EgtIf( b3Raw:getDimZ() < BD.MIN_DIM_HBEAM + 10 * GEO.EPS_SMALL, dMaxDepth, BD.MAX_DIM_HTCUT_HBEAM) local bDoubleHorizCut = ( not bHorizCut and b3Raw:getDimY() > 2 * dDimYRef - BD.CUT_EXTRA_MIN + 10 * GEO.EPS_SMALL) - local bDoubleCut = ( not bHorizCut and not bDoubleHorizCut and b3Raw:getDimY() > dDimYRef + 10 * GEO.EPS_SMALL) + local bDoubleCut = ( not bHorizCut and not bDoubleHorizCut and b3Raw:getDimY() > dDimYRef - BD.CUT_EXTRA + 10 * GEO.EPS_SMALL) -- dati geometrici del taglio local ptC, vtN = EgtSurfTmFacetCenter( Proc.Id, 0, GDB_ID.ROOT) -- se non obbligatorio e coincide con inizio grezzo, non va fatto diff --git a/LuaLibs/ProcessSplit.lua b/LuaLibs/ProcessSplit.lua index 0d9988f..87d7652 100644 --- a/LuaLibs/ProcessSplit.lua +++ b/LuaLibs/ProcessSplit.lua @@ -1,4 +1,4 @@ --- ProcessSplit.lua by Egaltech s.r.l. 2021/03/14 +-- ProcessSplit.lua by Egaltech s.r.l. 2021/03/25 -- Gestione calcolo tagli di separazione per Travi -- Tabella per definizione modulo @@ -170,9 +170,9 @@ function ProcessSplit.Make( Proc, nPhase, nRawId, nPartId) local dMaxVertDepth = dMaxDepth - ( BD.DECR_VERT_CUT or 0) -- caratteristiche taglio local bHorizCut = ( b3Raw:getDimY() > b3Raw:getDimZ() + 10 * GEO.EPS_SMALL and b3Raw:getDimZ() < dMaxVertDepth - BD.CUT_EXTRA) - local dDimYRef = EgtIf( b3Raw:getDimZ() < BD.MIN_DIM_HBEAM + 10 * GEO.EPS_SMALL, dMaxDepth - BD.CUT_EXTRA, BD.MAX_DIM_HTCUT_HBEAM) + local dDimYRef = EgtIf( b3Raw:getDimZ() < BD.MIN_DIM_HBEAM + 10 * GEO.EPS_SMALL, dMaxDepth, BD.MAX_DIM_HTCUT_HBEAM) local bDoubleHorizCut = ( not bHorizCut and b3Raw:getDimY() > 2 * dDimYRef - BD.CUT_EXTRA_MIN + 10 * GEO.EPS_SMALL) - local bDoubleCut = ( not bHorizCut and b3Raw:getDimY() > dDimYRef + 10 * GEO.EPS_SMALL) + local bDoubleCut = ( not bHorizCut and b3Raw:getDimY() > dDimYRef - BD.CUT_EXTRA + 10 * GEO.EPS_SMALL) -- dati geometrici del taglio local ptC, vtN = EgtSurfTmFacetCenter( Proc.Id, 0, GDB_ID.ROOT) -- flag di lavorazione faccia