From 8f602fc10ae8a84da97b511e0b8fb2d6a596db39 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Wed, 22 Jan 2025 17:09:35 +0100 Subject: [PATCH] - in RidgeLap aggiunta Q05 per usare la fresa (riconduce a LapJoint) - in ScarfJoint, in caso di taglio dal lato, aggiunto offset CUT_EXTRA che mancava per errore --- LuaLibs/ProcessRidgeLap.lua | 4 ++++ LuaLibs/ProcessScarfJoint.lua | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/LuaLibs/ProcessRidgeLap.lua b/LuaLibs/ProcessRidgeLap.lua index 27b1f8e..df34b2b 100644 --- a/LuaLibs/ProcessRidgeLap.lua +++ b/LuaLibs/ProcessRidgeLap.lua @@ -50,6 +50,7 @@ end -- Applicazione della lavorazione function ProcessRidgeLap.Make( Proc, nPhase, nRawId, nPartId, dOvmHead) local nForceUseBladeOnNotContinueFace = EgtGetInfo( Proc.Id, 'Q04', 'i') or 0 + local bUseMill = ( EgtGetInfo( Proc.Id, 'Q05', 'i') or 0) == 1 -- recupero l'ingombro del grezzo di appartenenza local b3Raw = EgtGetRawPartBBox( nRawId) -- ingombro del pezzo @@ -139,6 +140,9 @@ function ProcessRidgeLap.Make( Proc, nPhase, nRawId, nPartId, dOvmHead) if BL.IsCutNeeded( CutProc, b3Raw, dOvmHead) then local bOk, sErr = Cut.Make( CutProc, nPhase, nRawId, nPartId, dOvmHead, false) if not bOk then return bOk, sErr end + elseif bUseMill then + Proc.bForceMill = true + return LapJoint.Make( Proc, nPhase, nRawId, nPartId, dOvmHead) elseif nForceUseBladeOnNotContinueFace > 0 then EgtSurfTmRemoveFacet( Proc.Id, vFaceOrd[1] - 1) Proc.Fct = Proc.Fct - 1 diff --git a/LuaLibs/ProcessScarfJoint.lua b/LuaLibs/ProcessScarfJoint.lua index 9654d21..a785b95 100644 --- a/LuaLibs/ProcessScarfJoint.lua +++ b/LuaLibs/ProcessScarfJoint.lua @@ -443,7 +443,7 @@ function ProcessScarfJoint.Make( Proc, nPhase, nRawId, nPartId, dOvmHead, dOvmTa if not nGoodFace1 or nGoodFace1 == 0 then -- inserisco la lavorazione local vtRef2 = EgtIf( abs(vtRef:getZ()) < GEO.EPS_SMALL, Z_AX(), EgtIf( bHead, Y_AX(), -Y_AX())) - bOkd, sErrD = Fbs.MakeOne( nFace4, nGoodFace4 - 1, sCutting, dSawDiam, vtRef2, nil, 0, BD.CUT_SIC, 0, 0, 0, nil, b3Raw) + bOkd, sErrD = Fbs.MakeOne( nFace4, nGoodFace4 - 1, sCutting, dSawDiam, vtRef2, nil, BD.CUT_EXTRA, BD.CUT_SIC, 0, 0, 0, nil, b3Raw) if not bOkd then return bOkd, sErrD end -- lavoro la faccia opposta (definita dal parametro P11) if vFaceOrd[3] ~= 0 then