Merge branch 'develop'

2.7g4

LuaLibs/FacesBySaw.lua

@@ -83,8 +83,8 @@ function MakeParallelOne( nSurfId, nFacet, sCutting, dSawDiam, nFaceUse, dVzLimD
    if BD.KIOTP then Ktp = BD.KIOTP end
    if ( sLeadInOutType == 'PerpendicularOutraw') then
       bLioTang = false
-      dLiCompLength = dActualElevation + EgtMdbGetGeneralParam( MCH_GP.SAFEZ) + dCutExtra
-      dLoCompLength = dActualElevation + EgtMdbGetGeneralParam( MCH_GP.SAFEZ) + dCutExtra
+      dLiCompLength = dActualElevation + EgtMdbGetGeneralParam( MCH_GP.SAFEZ)
+      dLoCompLength = dActualElevation + EgtMdbGetGeneralParam( MCH_GP.SAFEZ)
       dLiTang = 1
       dLoTang = 1
       dLiPerp = 0

LuaLibs/ProcessLapJoint.lua

@@ -7197,9 +7197,11 @@ local function TestTwoFacesDownHead( Proc)
       if not ( Proc.Face[1].IsTooDownwardForTopBlade or Proc.Face[2].IsTooDownwardForTopBlade) then
          bDownHeadBlade = false
       else
-         if ( Proc.Face[1].IsTooDownwardForTopBlade and Proc.Face[2].IsTooWideForTopBlade) or
-            ( Proc.Face[2].IsTooDownwardForTopBlade and Proc.Face[1].IsTooWideForTopBlade) then
-            bDownHeadBlade = true
+         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
          end
       end
    end

LuaLibs/ProcessRidgeLap.lua

@@ -176,15 +176,15 @@ function ProcessRidgeLap.Make( Proc, nPhase, nRawId, nPartId, dOvmHead)
       local vtRef2 = Vector3d( vtN[vFaceOrd[2]])
       -- eseguo
       for i = 1, #vCuts do
-         local nOrthoOpposite
+         local vtOrtho
          if i % 2 == 1 then
-            nOrthoOpposite = BL.GetNearestOrthoOpposite( vtRef)
+            vtOrtho = vtRef
          else
-            nOrthoOpposite = BL.GetNearestOrthoOpposite( vtRef2)
+            vtOrtho = vtRef2
          end
          -- lavoro la faccia
          for j = 1, #vCuts[i] do
-            local bOk, sErr = Fbs.MakeOne( vCuts[i][j], 0, sCutting, dSawDiam, nOrthoOpposite, dVzLimDwnUp, 0, BD.CUT_SIC, 0, 0, 0, nil, b3Raw)
+            local bOk, sErr = Fbs.MakeOne( vCuts[i][j], 0, sCutting, dSawDiam, vtOrtho, dVzLimDwnUp, 0, BD.CUT_SIC, 0, 0, 0, nil, b3Raw)
             if not bOk then
                return bOk, sErr
             end

UpdateLog.txt

@@ -1,5 +1,14 @@
            ==== Beam Update Log ====
 
+Versione 2.7g5 (14/07/2025)
+- Fixed : in tagli di testa e coda corretti attacchi
+
+Versione 2.7g4 (11/07/2025)
+- Fixed : in LapJoint 2 facce correzione nella scelta lama da sotto
+
+Versione 2.7g3 (11/07/2025)
+- Fixed : in RidgeLap corretta scelta del lato da lavorare
+
 Versione 2.7g2 (10/07/2025)
 - Fixed : in LapJoint correzione per caso in cui la sega a catena lavorava la tasca in modo errato
 

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '2.7g2'
+VERSION = '2.7g5'
 MIN_EXE = '2.7f2'