Merge branch 'release/3.1g5'

3.1g4

LuaLibs/BeamExec.lua

@@ -996,12 +996,12 @@ local function OrderFeatures( vProc, b3Raw, nPartId)
          return true
       end
       -- se primo è foro e secondo è un ribasso o tenone, il foro va sempre prima a meno che il ribasso non sia di testa
-      if Drill.Identify(B1) and ( LapJoint.Identify(B2) or Mortise.Identify(B2) or Tenon.Identify(B2)) and B2.PassedByHole and
+      if Drill.Identify(B1) and ( LapJoint.Identify(B2) or Mortise.Identify(B2) or Tenon.Identify(B2) or ScarfJoint.Identify(B2)) and B2.PassedByHole and
          B1.Box:getCenter():getX() > B2.Box:getMin():getX() and B1.Box:getCenter():getX() < B2.Box:getMax():getX() then
          return true
       end
       -- se primo è un ribasso e secondo è un foro o tenone, il ribasso va sempre dopo a meno che il ribasso non sia di testa
-      if ( LapJoint.Identify(B1) or Mortise.Identify(B1) or Tenon.Identify(B1)) and B1.PassedByHole and Drill.Identify(B2) and
+      if ( LapJoint.Identify(B1) or Mortise.Identify(B1) or Tenon.Identify(B1) or ScarfJoint.Identify(B1)) and B1.PassedByHole and Drill.Identify(B2) and
          B2.Box:getCenter():getX() > B1.Box:getMin():getX() and B2.Box:getCenter():getX() < B1.Box:getMax():getX() then
          return false
       end
@@ -2227,8 +2227,8 @@ function GetFeatureInfoAndDependency( vProc, b3Raw, nPartId)
                   and DtMortise.SideIdentify( ProcB) and Overlaps( Proc.Box, ProcB.Box)  and DtMortise.IsDeeper( ProcB, b3Raw) then
                   Proc.PassedByDtMortise = true
                end
-               -- se tenone è attraversato da foro allora il foro deve essere fatto prima
-               if Tenon.Identify( Proc) and Drill.Identify( ProcB) and Overlaps( Proc.Box, ProcB.Box) then
+               -- se tenone o ScarfJoint sono attraversati da foro allora il foro deve essere fatto prima
+               if ( Tenon.Identify( Proc) or ScarfJoint.Identify( Proc)) and Drill.Identify( ProcB) and Overlaps( Proc.Box, ProcB.Box) then
                   Proc.PassedByHole = true
                end
                -- se taglio attraversato da foro, si definisce precedenza in base ad angolo

LuaLibs/ProcessDrill.lua

@@ -667,7 +667,7 @@ function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
             end
          end
       else
-         sUserNotes = EgtSetValInNotes( sUserNotes, 'LastStep', MIRROR_DRILLINGS_MIN_DISTANCE / 2 + 15)
+         sUserNotes = EgtSetValInNotes( sUserNotes, 'LastStep', MIRROR_DRILLINGS_MIN_DISTANCE / 2 + 10)
       end
       if dDepth > Proc.MachDepthDouble + 10 * GEO.EPS_SMALL then
          sMyWarn = 'Warning in double head drilling : depth (' .. EgtNumToString( dDepth, 1) .. ') reduced to (' .. EgtNumToString( Proc.MachDepthDouble, 1) .. ') to match H2 max tool depth'

LuaLibs/ProcessLapJoint.lua

@@ -1955,14 +1955,21 @@ local function MakeRoundCleanContour( Proc, nPhase, nRawId, nPartId, b3Raw,
       -- inversione direzione utensile
       local bInvertMach = false
       if nPathInt then
-         -- verifico se devo invertire direzione utensile (in caso di direzione verso la verticale)
-         if vtN1:getZ() < BD.NZ_MINA and abs(vtN1:getZ()) >= 0.707 then
-            EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
-            bInvertMach = true
-         -- altrimenti se da fare in una sola volta e direzionato verso Y+ lo inverto per lavorarlo davanti
-         elseif not bDoubleSide and vtN1:getY() > GEO.EPS_SMALL then
-            EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
-            bInvertMach = true
+         if bMillDown and not bDoubleSide then
+            if vtN1:getZ() > 10 * GEO.EPS_SMALL then
+               EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
+               bInvertMach = true
+            end
+         else
+            -- verifico se devo invertire direzione utensile (in caso di direzione verso la verticale)
+            if vtN1:getZ() < BD.NZ_MINA and abs(vtN1:getZ()) >= 0.707 then
+               EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
+               bInvertMach = true
+            -- altrimenti se da fare in una sola volta e direzionato verso Y+ lo inverto per lavorarlo davanti
+            elseif not bDoubleSide and vtN1:getY() > GEO.EPS_SMALL then
+               EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
+               bInvertMach = true
+            end
          end
       end
       -- imposto posizione braccio porta testa
@@ -5713,17 +5720,8 @@ function SawPlusChain.CalculateLeadInOut( Machining, EdgeToMachine, FaceToMachin
          LeadIn.StartAddLength = BD.CUT_EXTRA
          LeadOut.EndAddLength = BD.CUT_EXTRA
       end
-      local vtN = Vector3d( FaceToMachine.VtN)
-      local vtOrthO
-      if EdgeToMachine.Elevation > - 10 * GEO.EPS_SMALL then
-         vtOrthO = Vector3d( EdgeToMachine.ToolDirection)
-      else
-         vtOrthO = -Vector3d( EdgeToMachine.ToolDirection)
-      end
-      local ptP1 = Point3d( FaceToMachine.Edges.BottomEdge.ptStart)
-      local ptP2 = Point3d( FaceToMachine.Edges.BottomEdge.ptEnd)
-      local vtV1 = -Vector3d( FaceToMachine.Edges.SideEdges.StartEdge.vtEdge)
-      local vtV2 = Vector3d( FaceToMachine.Edges.SideEdges.EndEdge.vtEdge)
+      local ptP1 = Point3d( EdgeToMachine.ptStart)
+      local ptP2 = Point3d( EdgeToMachine.ptEnd)
       
       local bInvert = Machining.Invert
       if bInvert then
@@ -5734,16 +5732,6 @@ function SawPlusChain.CalculateLeadInOut( Machining, EdgeToMachine, FaceToMachin
       Machining.vtTg = vtTg
       Machining.vtV = vtV1
       
-      -- Versore di riferimento
-      local vtRef = Vector3d( vtTg)
-      vtRef:rotate( vtN, EgtIf( bInvert, -90, 90))
-      
-      local b3Box = BBox3d( b3Raw)
-      b3Box:expand( BD.CUT_SIC)
-      local ptPa1 = ptP1 + LeadIn.StartAddLength * -vtTg
-      local ptPa2 = ptP2 + LeadOut.EndAddLength * vtTg
-
-      LeadIn.TangentDistance, LeadIn.PerpDistance, LeadOut.TangentDistance, LeadOut.PerpDistance = Fbs.CalcLeadInOutPerpGeom(  ptPa1, ptPa2, vtV1, vtV2, vtN, ( Machining.Tool.Diameter / 2), vtRef, -Machining.RadialOffset, b3Box)
    else
       if Machining.IsStartClosed then
          LeadIn.StartAddLength = -dAddLengthToReduce
@@ -5856,23 +5844,42 @@ function SawPlusChain.ApplyMachining( Machining, b3Raw)
 end
 
 
-function SawPlusChain.Saw.GetSCC( vtMachiningDirection)
+function SawPlusChain.Saw.GetSCC( vtMachiningDirection, vtN, vtTg)
    -- TODO implementare SCC come per FacesBySaw
-   local nSCC = MCH_SCC.NONE
-   if AreSameVectorApprox( vtMachiningDirection, Z_AX()) then
-      nSCC = MCH_SCC.ADIR_ZP
-   elseif AreOppositeVectorApprox( vtMachiningDirection, Z_AX()) then
-      nSCC = MCH_SCC.ADIR_ZM
-   elseif AreSameVectorApprox( vtMachiningDirection, Y_AX()) then
-      nSCC = MCH_SCC.ADIR_YP
-   elseif AreOppositeVectorApprox( vtMachiningDirection, Y_AX()) then
-      nSCC = MCH_SCC.ADIR_YM
-   elseif AreSameVectorApprox( vtMachiningDirection, X_AX()) then
-      nSCC = MCH_SCC.ADIR_XP
-   elseif AreOppositeVectorApprox( vtMachiningDirection, X_AX()) then
-      nSCC = MCH_SCC.ADIR_XM
+   if not BD.TURN then
+      -- per ora aggregato usato in verticale solo in split e headcut; Fast non influenzata
+      if BD.C_SIMM and bMaximizeVerticalDepth then
+         nSCC = MCH_SCC.ADIR_ZM
+      elseif abs( vtMachiningDirection:getX()) > abs( vtMachiningDirection:getY()) - GEO.EPS_SMALL then
+         -- se il taglio è orizzontale, si gira aggregato lama per facilitare caduta del legno
+         if abs( vtTg:getZ()) < 10 * GEO.EPS_SMALL and not AreSameOrOppositeVectorApprox( vtN, Z_AX()) then
+            nSCC = EgtIf( ( vtMachiningDirection:getX() > -GEO.EPS_SMALL), MCH_SCC.ADIR_XM, MCH_SCC.ADIR_XP)
+         else
+            nSCC = EgtIf( ( vtMachiningDirection:getX() > -GEO.EPS_SMALL), MCH_SCC.ADIR_XP, MCH_SCC.ADIR_XM)
+         end
+      else
+         -- se il taglio è orizzontale, si gira aggregato lama per facilitare caduta del legno
+         if abs( vtTg:getZ()) < 10 * GEO.EPS_SMALL and not AreSameOrOppositeVectorApprox( vtN, Z_AX()) then
+            nSCC = EgtIf( ( vtMachiningDirection:getY() > -GEO.EPS_SMALL), MCH_SCC.ADIR_YM, MCH_SCC.ADIR_YP)
+         else
+            nSCC = EgtIf( ( vtMachiningDirection:getY() > -GEO.EPS_SMALL), MCH_SCC.ADIR_YP, MCH_SCC.ADIR_YM)
+         end
+      end
+   else
+      if AreSameVectorApprox( vtMachiningDirection, Z_AX()) then
+         nSCC = MCH_SCC.ADIR_ZP
+      elseif AreOppositeVectorApprox( vtMachiningDirection, Z_AX()) then
+         nSCC = MCH_SCC.ADIR_ZM
+      elseif AreSameVectorApprox( vtMachiningDirection, Y_AX()) then
+         nSCC = MCH_SCC.ADIR_YP
+      elseif AreOppositeVectorApprox( vtMachiningDirection, Y_AX()) then
+         nSCC = MCH_SCC.ADIR_YM
+      elseif AreSameVectorApprox( vtMachiningDirection, X_AX()) then
+         nSCC = MCH_SCC.ADIR_XP
+      elseif AreOppositeVectorApprox( vtMachiningDirection, X_AX()) then
+         nSCC = MCH_SCC.ADIR_XM
+      end
    end
-
    return nSCC
 end
 
@@ -5994,8 +6001,6 @@ function SawPlusChain.Saw.CalculateMachiningParameters( Proc, FaceToMachine, Edg
       Cutting.Faceuse = BL.GetNearestOrthoOpposite( -EdgeToMachine.ToolDirection)
    end
    Cutting.nEdgeFaceUse = EdgeToMachine.Id
-   -- SCC
-   Cutting.SCC = SawPlusChain.Saw.GetSCC( EdgeToMachine.ToolDirection)
    -- asse bloccato
    Cutting.BlockedAxis = {}
    Cutting.BlockedAxis.Orientation = 'perpendicular'
@@ -6003,6 +6008,8 @@ function SawPlusChain.Saw.CalculateMachiningParameters( Proc, FaceToMachine, Edg
    Cutting.BlockedAxis.VtOut = EgtIf( FaceToMachine.VtN:getX() > 0, X_AX(), -X_AX())
    -- approccio e retrazione
    Cutting.LeadIn, Cutting.LeadOut = SawPlusChain.CalculateLeadInOut( Cutting, EdgeToMachine, FaceToMachine, b3Raw)
+   -- SCC
+   Cutting.SCC = SawPlusChain.Saw.GetSCC( EdgeToMachine.ToolDirection, FaceToMachine.VtN, Cutting.vtTg)
    -- eventuale step orizzontale
    Cutting.HorizontalSteps = {}
    if Cutting.Tool.SideStep then
@@ -6036,25 +6043,15 @@ function SawPlusChain.Saw.ApplyAllSteps( Cutting, b3Raw)
    local bIsCuttingOk = false
    local sCuttingOriginalMessage = Cutting.Message or ''
    local sCuttingApplyMessage = ''
-   local vtTg = Cutting.vtTg
-   local bInvert = Cutting.Invert
    local dOriginalRadialOffset = Cutting.RadialOffset
    local dOriginalLeadInPerpDistance = Cutting.LeadIn.PerpDistance
-   local dOriginalLeadInTangDistance = Cutting.LeadIn.TangentDistance
    local dOriginalLeadOutPerpDistance = Cutting.LeadOut.PerpDistance
-   local dOriginalLeadOutTangDistance = Cutting.LeadOut.TangentDistance
    
    for i = Cutting.HorizontalSteps.Count, 1, -1 do
       Cutting.RadialOffset = dOriginalRadialOffset + Cutting.HorizontalSteps.StepLength * ( i - 1)
-      local dOrthoOffsetStep = ( Cutting.RadialOffset * ( Cutting.vtV * vtTg))
       -- update distanza perpendicolare attacco per contemplare l'offset applicato
       Cutting.LeadIn.PerpDistance = dOriginalLeadInPerpDistance - Cutting.RadialOffset
-      Cutting.LeadIn.TangentDistance = dOriginalLeadInTangDistance + dOrthoOffsetStep + Cutting.LeadIn.StartAddLength
       Cutting.LeadOut.PerpDistance = dOriginalLeadOutPerpDistance - Cutting.RadialOffset
-      Cutting.LeadOut.TangentDistance = dOriginalLeadOutTangDistance - dOrthoOffsetStep - Cutting.LeadOut.EndAddLength
-
-      Cutting.LeadIn.StartAddLength = Cutting.LeadIn.StartAddLength - dOrthoOffsetStep - Cutting.LeadIn.StartAddLength
-      Cutting.LeadOut.EndAddLength = Cutting.LeadOut.EndAddLength + dOrthoOffsetStep + Cutting.LeadOut.EndAddLength
       -- applicazione lavorazione
       bIsCuttingOk, sCuttingApplyMessage = SawPlusChain.ApplyMachining( Cutting, b3Raw)
       -- update messaggi

LuaLibs/ProcessProfCamb.lua

@@ -33,6 +33,7 @@ local sEnableExtraBladeUpperFace = 'Q02' -- i
 local sDepthChamferMill          = 'Q03' -- d
 local sOverMaterialForFinish     = 'Q04' -- d
 local sPreemptiveChamfer         = 'Q05' -- i
+local sDisableAntiSplint         = 'Q19'
 
 -- abilitazioni extra
 local dMakeAntiSplintOnHead = 1 -- valore impronta antischeggia, per disattivare settare = nil o = 0
@@ -301,13 +302,14 @@ function ProcessProfCamb.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    local sMilling
    -- in base alla direzione iniziale della curva e al valore di entrata valido, setto l'antischeggia
    local bMakeAs
+   local bDeleteAntiSplint = ( EgtGetInfo( Proc.Id, sDisableAntiSplint, 'i') or 0) == 1
    local vtStart = EgtSV( AuxId, GDB_ID.ROOT)
    if nSide == 0 then
-      if abs(vtStart:getY()) >= dActivateCompoAng and dMakeAntiSplintOnHead and abs(dMakeAntiSplintOnHead) > 0 then
+      if abs( vtStart:getY()) >= dActivateCompoAng and dMakeAntiSplintOnHead and abs( dMakeAntiSplintOnHead) > 0 and not bDeleteAntiSplint then
          bMakeAs = true
       end
    else
-      if abs(vtStart:getZ()) >= dActivateCompoAng and dMakeAntiSplintOnHead and abs(dMakeAntiSplintOnHead) > 0 then
+      if abs( vtStart:getZ()) >= dActivateCompoAng and dMakeAntiSplintOnHead and abs( dMakeAntiSplintOnHead) > 0 and not bDeleteAntiSplint then
          bMakeAs = true
       end
    end

UpdateLog.txt

@@ -1,4 +1,17 @@
            ==== Beam Update Log ====
+Versione 3.1g5 (31/07/2026)
+- Fixed : in RoundCleanContour per tasche a 3 facce a U in doppio
+
+Versione 3.1g4 (31/07/2026)
+- Modif : in ProfCamb aggiunta Q19, se = 1 disabilita lavorazione AntiSplint
+- Fixed : in RoundCleanContour per tasche a 3 facce a U MillDown
+
+Versione 3.1g3 (24/07/2026)
+- Fixed : in slot con lama corretta scelta SCC
+
+Versione 3.1g2 (17/07/2026)
+- Modif : Diminuito LastStep forature in doppio
+- Modif : ScarfJoint tra le feature da eseguire dopo i fori che la attraversano
 
 Versione 3.1g1 (14/07/2026)
 - Modif : in slot con lama migliorati attacchi inclinati

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '3.1g1'
+VERSION = '3.1g5'
 MIN_EXE = '3.1b1'