Merge branch 'test_SkipMortCut_T#3005' into develop

BatchProcessNew.lua

@@ -277,6 +277,15 @@ if bToProcess then
             else
                vBeam[i].Box = b3Solid
             end
+            if BD.MAX_LENGTH and BD.MAX_LENGTH > 10 and b3Solid:getDimX() > BD.MAX_LENGTH then
+               local sOut = 'Piece-Length ('  .. EgtNumToString( b3Solid:getDimX(), 2) .. ') ' ..
+                         'out of machine limits (' .. EgtNumToString( BD.MAX_LENGTH, 2) .. ') '
+               BEAM.ERR = 17
+               BEAM.MSG = sOut
+               WriteErrToLogFile( BEAM.ERR, BEAM.MSG)
+               PostErrView( BEAM.ERR, BEAM.MSG)
+               return
+            end
          end
          -- Assegno lunghezza della barra
          dBarLen = vBeam[1].Box:getDimX() + 10
@@ -330,6 +339,15 @@ if bToProcess then
          else
             vBeam[i].Box = b3Solid
          end
+         if BD.MAX_LENGTH and BD.MAX_LENGTH > 10 and b3Solid:getDimX() > BD.MAX_LENGTH then
+            local sOut = 'Piece-Length ('  .. EgtNumToString( b3Solid:getDimX(), 2) .. ') ' ..
+                         'out of machine limits (' .. EgtNumToString( BD.MAX_LENGTH, 2) .. ') '
+            BEAM.ERR = 17
+            BEAM.MSG = sOut
+            WriteErrToLogFile( BEAM.ERR, BEAM.MSG)
+            PostErrView( BEAM.ERR, BEAM.MSG)
+            return
+         end
       end
    end
 

LuaLibs/BeamExec.lua

@@ -1641,7 +1641,8 @@ local function SetCutsOnFrontMortises( vProc)
                   -- verifico se i piani coincidono
                   local bSamePlane = ( ptC1 and vtN1 and ptC2 and vtN2 and AreSameVectorApprox( vtN1, vtN2) and ( ptC2 - ptC1) * vtN1 < 1.0)
                   if bSamePlane then
-                     vProc[i].CutFront = vProc[j].Id
+                     --vProc[i].CutFront = vProc[j].Id
+                     vProc[j].bSkipCut = true
                   end
                   -- log
                   local sMsg = string.format( 'Cut %d meet Mortise %d', vProc[i].Id, vProc[j].Id) .. EgtIf( bSamePlane, ' with same plane', '')
@@ -1658,7 +1659,8 @@ local function SetCutsOnFrontMortises( vProc)
                   -- verifico se i piani coincidono
                   local bSamePlane = ( ptC1 and vtN1 and ptC2 and vtN2 and AreSameVectorApprox( vtN1, vtN2) and ( ptC2 - ptC1) * vtN1 < 1.0)
                   if bSamePlane then
-                     vProc[i].CutFront = vProc[j].Id
+                     --vProc[i].CutFront = vProc[j].Id
+                     vProc[j].bSkipCut = true
                   end
                   -- log
                   local sMsg = string.format( 'Cut %d meet DtMortise %d', vProc[i].Id, vProc[j].Id) .. EgtIf( bSamePlane, ' with same plane', '')

LuaLibs/ProcessDtMortise.lua

@@ -236,7 +236,7 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    -- verifico se frontale
    local bFront = ( Proc.Prc == 56)
    -- se mortasa di fronte, eseguo il taglio della faccia
-   if bFront then
+   if bFront and not Proc.bSkipCut then
       -- verifico esista la faccia di taglio
       local ptCutC, vtCutN = EgtSurfTmFacetCenter( Proc.Id, 1, GDB_ID.ROOT)
       if ptCutC and vtCutN and AreSameVectorApprox( vtExtr, vtCutN) then

LuaLibs/ProcessLapJoint.lua

@@ -4800,6 +4800,16 @@ local function ManageAntiSplintBySaw( Proc, b3Raw, b3Solid, bIsU, vtN, nFacInd,
          local dSawThick = 0
          local dMaxDepth = 200
          local bAdj, dAng, dExtraOffs, sWarn2, nIdMach
+         -- Se faccia sulla quale cerca di applicare l'antisplint è chiusa e limitata da altre facce non lo applica
+         local FacetEdge = BL.GetEdgesInfo( Proc, Proc.Face[nFacet+1])
+         for nEdge = 1, #FacetEdge do
+            if AreSameVectorApprox( FacetEdge[nEdge].ToolDirection, vtN) and ( not FacetEdge[nEdge].IsStartOpen or not FacetEdge[nEdge].IsEndOpen) and not FacetEdge[nEdge].IsOpen then
+               sWarn2 = 'Warning : antisplint not applicable on closed face'
+               if not sWarn then sWarn = '' end
+               sWarn = EgtIf( #sWarn > 0, sWarn .. '\n' .. sWarn2, sWarn2)
+               return bMadeASbyBld, true, sWarn
+            end
+         end
          bMadeASbyBld, sWarn2, nIdMach, dSawThick, dMaxDepth, bAdj, dAng, dExtraOffs = MakeAntiSplintBySaw( Proc, nFacet, vtN, b3Raw, nFacInd, bReduceDepth, bMillDown)
          if not bMadeASbyBld then return bMadeASbyBld, false, sWarn2 end
          if sWarn2 then

LuaLibs/ProcessMortise.lua

@@ -467,7 +467,7 @@ function ProcessMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    end
 
    -- se mortasa di fronte, eseguo il taglio della faccia
-   if bFront then
+   if bFront and not Proc.bSkipCut then
       -- verifico esista la faccia di taglio
       local ptCutC, vtCutN = EgtSurfTmFacetCenter( Proc.Id, 1, GDB_ID.ROOT)
       if ptCutC and vtCutN and AreSameVectorApprox( vtExtr, vtCutN) then

Process.lua

@@ -89,6 +89,14 @@ local function MyProcessInputData()
       else
          vBeam[i].Box = b3Solid
       end
+      if BD.MAX_LENGTH and BD.MAX_LENGTH > 10 and b3Solid:getDimX() > BD.MAX_LENGTH then
+         local sOut = 'Lunghezza ('  .. EgtNumToString( b3Solid:getDimX(), 2) .. ') ' ..
+                      'oltre i limiti della macchina (' .. EgtNumToString( BD.MAX_LENGTH, 2) .. ') '
+         EgtOutLog( sOut)
+         EgtOutBox( sOut, 'Lavora Travi', 'WARNING')
+         EgtDraw()
+         return false
+      end
    end
    dRawW = vBeam[1].Box:getDimY()
    dRawH = vBeam[1].Box:getDimZ()

UpdateLog.txt

@@ -1,5 +1,10 @@
            ==== Beam Update Log ====
 
+Versione 3.1e2 (01/06/2026)
+- Added : in Cut aggiunta Q18 per evitare di ruotare
+- Modif : gli smussi di testa sono in senso orario
+- Modif : in mortasa coda di rondine piccole correzioni
+
 Versione 3.1e1 (05/05/2026)
 - Modif : in LapJoint migliorate slot con sega a catena
 - Fixed : in DrillPocket in doppio eliminata lavorazione aggiuntiva in caso di utensile non abbastanza lungo