Merge branch 'develop' into DicingPreSimDynamicRaw

- in BLADETOWASTE.UpdateDiceRaw alcune correzioni

BatchProcessNew.lua

@@ -388,6 +388,15 @@ if bToProcess then
             else
                PARTS[i].b3PartOriginal = b3Solid
             end
+            if BeamData.MAX_LENGTH and BeamData.MAX_LENGTH > 10 and b3Solid:getDimX() > BeamData.MAX_LENGTH then
+               local sOut = 'Piece-Length ('  .. EgtNumToString( b3Solid:getDimX(), 2) .. ') ' ..
+                         'out of machine limits (' .. EgtNumToString( BeamData.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 = PARTS[1].b3PartOriginal:getDimX() + 10
@@ -447,6 +456,15 @@ if bToProcess then
          else
             PARTS[i].b3PartOriginal = b3Solid
          end
+         if BeamData.MAX_LENGTH and BeamData.MAX_LENGTH > 10 and b3Solid:getDimX() > BeamData.MAX_LENGTH then
+            local sOut = 'Piece-Length ('  .. EgtNumToString( b3Solid:getDimX(), 2) .. ') ' ..
+                         'out of machine limits (' .. EgtNumToString( BeamData.MAX_LENGTH, 2) .. ') '
+            BEAM.ERR = 17
+            BEAM.MSG = sOut
+            WriteErrToLogFile( BEAM.ERR, BEAM.MSG)
+            PostErrView( BEAM.ERR, BEAM.MSG)
+            return
+         end
       end
    end
 
@@ -492,6 +510,7 @@ if bToProcess then
          return
       end
 
+      -- TODO in caso di  "GEN_sPiecesLoadingPosition = FULL_PRE_ROTATION"  bisogna controllare anche sezione ribaltata di 90°
       -- Verifico sezione barra non troppo grande
       if not BeamData.MAX_WIDTH2 or not BeamData.MAX_HEIGHT2 then
          if ( dRawW > BeamData.MAX_WIDTH + 10 * GEO.EPS_SMALL or dRawH > BeamData.MAX_HEIGHT + 10 * GEO.EPS_SMALL) then

GetBeamData.lua

@@ -0,0 +1,44 @@
+-- GetWallData.lua by Egaltech s.r.l. 2022/06/28
+-- Recupero dati da file WallData.lua di macchina
+
+-- Intestazioni
+require( 'EgtBase')
+_ENV = EgtProtectGlobal()
+EgtEnableDebug( false)
+
+-- Per test
+--GWD = {}
+--GWD.MACHINE = 'Essetre-90480019_MW'
+
+local sLog = 'GetBeamData : ' .. GWD.MACHINE
+EgtOutLog( sLog)
+
+-- Imposto direttorio libreria specializzata per Travi
+EgtAddToPackagePath( GWD.BASEDIR .. '\\LuaLibs\\?.lua')
+
+-- Verifico che la macchina corrente sia abilitata per la lavorazione delle Travi
+local sMachDir = EgtGetCurrMachineDir()
+if not EgtExistsFile( sMachDir .. '\\Beam\\BeamDataNew.lua') then
+   GWD.ERR = 12
+   GWD.MSG = 'Error not configured for beam machine : ' .. GWD.MACHINE
+   WriteErrToLogFile( GWD.ERR, GWD.MSG)
+   PostErrView( GWD.ERR, GWD.MSG)
+   return
+end
+
+-- Elimino direttori altre macchine e imposto direttorio macchina corrente per ricerca librerie
+EgtRemoveBaseMachineDirFromPackagePath()
+EgtAddToPackagePath( sMachDir .. '\\Beam\\?.lua')
+
+-- Carico i dati globali
+_G.package.loaded.BeamData = nil
+local BD = require( 'BeamDataNew')
+
+-- Assegno valori di interesse
+GWD.SIMUL_VIEW_DIR = BD.SIMUL_VIEW_DIR
+GWD.OVM_MID = BD.OVM_MID
+
+-- Tutto ok
+GWD.ERR = 0
+
+EgtOutLog( ' +++ GetBeamData completed')

LuaLibs/BeamExec.lua

@@ -153,6 +153,11 @@ function BeamExec.GetToolsFromDB()
          Tool.nDouble = EgtGetValInNotes( Tool.sUserNotes, 'DOUBLE', 'd')
          Tool.bIsProfiledTool = not EgtTdbIsCurrToolStandardDraw()
 
+         -- TODO per capire se ToolHolder è flottante bisogna leggere nota TYPE='Float' su ToolHolder. Serve funzione
+         -- info per utensile su ToolHolder flottante
+         Tool.dOverHang = EgtGetValInNotes( Tool.sUserNotes, 'TOOL_OVERHANG', 'd') or 0
+         Tool.bToolOnFloatingTH = Tool.dOverHang > 0
+
          -- lettura parametri non comuni ( famiglia DRILLBIT non ha parametri specifici)
          if sToolFamily ~= 'DRILLBIT' then
             Tool.dThickness = EgtTdbGetCurrToolParam( MCH_TP.THICK)
@@ -1772,8 +1777,9 @@ function BeamExec.ProcessMachinings( PARTS, bIsFlipRot)
          local nInitialPosition = MatrixResult.nInitialPosition
          -- PREROTAZIONE PEZZO
          if MatrixResult.nInitialPosition ~= 1 or PARTS[nPart].bPartInCombiIsInverted then
-            -- si toglie il pezzo dal grezzo per poter fare operazioni
+            -- si esce dalle lavorazioni e si torna in disegna
-            EgtRemovePartFromRawPart( PARTS[nPart].id)
+            local nCurrMachGroup = EgtGetCurrMachGroup()
+            EgtResetCurrMachGroup()
 
             -- salvo situazione precedente su lista BEAM ( scrittura variabili globali per interfaccia)
             if bIsFlipRot then
@@ -1795,11 +1801,8 @@ function BeamExec.ProcessMachinings( PARTS, bIsFlipRot)
                EgtRotate( PARTS[nPart].id, ptRot, X_AX(), nRotationDeg, GDB_RT.GLOB)
             end
 
-            -- si rimette il pezzo nel grezzo
+            -- si riattiva il MachGroup, i pezzi son rimasti dove erano
-            EgtAddPartToRawPart( PARTS[nPart].id, {0,0,0}, PARTS[nPart].idRaw)
+           EgtSetCurrMachGroup( nCurrMachGroup)
-
-            -- dico che il pezzo originale è nella posizione iniziale come arriva da BTL ( è stato appena ruotato qui sopra)
-            nInitialPosition = 1
          end
 
          -- salvo sul PART la posizione di partenza che è stata scelta
@@ -1895,8 +1898,6 @@ function BeamExec.ProcessMachinings( PARTS, bIsFlipRot)
             if PARTS[nPart].bPartInCombiIsInverted then
                BeamLib.InvertRawPart( PARTS[nPart], -2)
             end
-            -- ripristino anche eventuali pre-rotazioni
-            nInitialPosition = nInitialPosition + ( BEAM.PREROTATE90 or 0)
             -- si ribalta il pezzo in posizione iniziale
             BeamLib.RotateRawPart( PARTS[nPart], 1 - nInitialPosition)
          else

LuaLibs/BeamLib.lua

@@ -796,6 +796,7 @@ function BeamLib.BinaryToDecimal( dNumber)
 end
 
 -------------------------------------------------------------------------------------------------------------
+-- TODO si può sostituire con funzione EgtNumToBitString
 function BeamLib.DecimalToBinary( dNumber)
    local sNumberToConvert = tostring( dNumber)
    local n = sNumberToConvert

LuaLibs/DiceCut.lua

@@ -453,7 +453,7 @@ function DiceCut.GetDice( Part, Face1, Face2, OptionalParameters)
    -- se piani non ortogonali, diminuisco la distanza di offset opportunamente
    local dOffsetParallelOriginal = dOffsetParallel
    if not bGetOrtoPlanes then
-      local dCoeff = ( vtNMainFace ^ vtNSubordinateFace):len()
+      local dCoeff = max( ( vtNMainFace ^ vtNSubordinateFace):len(), 0.5)
       dOffsetParallel = dOffsetParallel * dCoeff
       dOffsetOrthogonal = dOffsetOrthogonal * dCoeff
    end

LuaLibs/FeatureLib.lua

@@ -337,6 +337,9 @@ function FeatureLib.GetAdditionalInfo( Proc, Part)
       Proc.AdjacencyMatrix = FaceData.GetAdjacencyMatrix( Proc)
       Proc.Faces = FaceData.GetFacesInfo( Proc, Part)
       Proc.FeatureInfo, Proc.MainFaces = FeatureLib.GetRafterNotchData( Proc)
+   elseif ( ID.IsScarfJoint( Proc) or ID.IsScarfSimple( Proc)) then
+      Proc.AdjacencyMatrix = FaceData.GetAdjacencyMatrix( Proc)
+      Proc.Faces = FaceData.GetFacesInfo( Proc, Part)
    end
 
    return Proc

LuaLibs/MachiningLib.lua

@@ -347,7 +347,7 @@ local function TestEngagement( sBladeEngagement, Parameters, OptionalParameters)
       return false
    end
    -- lavorazione in collisione con il pezzo: non fattibile
-   local bCollisionFound, bMoveAfterSplit = PreSimulationLib.CheckCollision( sBladeEngagement, CheckCollisionParameters, CheckCollisionOptionalParameters)
+   local bCollisionFound, bMoveAfterSplit = PreSimulationLib.CheckCollision( CheckCollisionParameters, CheckCollisionOptionalParameters)
    if bCollisionFound then
       return false
    end
@@ -363,16 +363,22 @@ local function TestEngagement( sBladeEngagement, Parameters, OptionalParameters)
    -- attacco perpendicolare
    local PerpendicularLeadInOut = LeadInOutLib.CalculateLeadInOut( 'Perpendicular', Parameters, LeadInOutOptionalParameters)
    -- check extracorsa nei punti di attacco
-
    PointsOnToolTipCenter = {
       PreSimulationLib.GetPointOnToolTipCenter( PerpendicularLeadInOut.LeadIn.ptPoint, vtHead, Face.vtN, Edge.vtN, Tool),
       PreSimulationLib.GetPointOnToolTipCenter( PerpendicularLeadInOut.LeadOut.ptPoint, vtHead, Face.vtN, Edge.vtN, Tool)
    }
    local bOutOfStrokePerpendicular = PreSimulationLib.CheckOutOfStrokeFromPoints( PointsOnToolTipCenter, vtHead, nSCC, Tool)
-   -- se non è in extracorsa si aggiunge come attacco possibile
+   -- attacco perpendicolare non in extracorsa: si verifica se è in collisione
    if not bOutOfStrokePerpendicular then
+      CheckCollisionOptionalParameters.PointsToCheck = {}
+      table.insert( CheckCollisionOptionalParameters.PointsToCheck, PerpendicularLeadInOut.LeadIn.ptPoint)
+      table.insert( CheckCollisionOptionalParameters.PointsToCheck, PerpendicularLeadInOut.LeadOut.ptPoint)
+      local bCollisionFoundPerpendicular, bMoveAfterSplitPerpendicular = PreSimulationLib.CheckCollision( CheckCollisionParameters, CheckCollisionOptionalParameters)
+      -- attacco perpendicolare possibile
+      if not bCollisionFoundPerpendicular then
          LeadInOut.Perpendicular = PerpendicularLeadInOut
-      LeadInOut.Perpendicular.bMoveAfterSplit = bMoveAfterSplit
+         LeadInOut.Perpendicular.bMoveAfterSplit = bMoveAfterSplitPerpendicular
+      end
    end
    -- se c'è almeno un lato chiuso l'unico attacco possibile è il perpendicolare
    if not ( Edge.bIsStartOpen and Edge.bIsEndOpen) then
@@ -397,7 +403,7 @@ local function TestEngagement( sBladeEngagement, Parameters, OptionalParameters)
       CheckCollisionOptionalParameters.PointsToCheck = {}
       table.insert( CheckCollisionOptionalParameters.PointsToCheck, TangentLeadInOut.LeadIn.ptPoint)
       table.insert( CheckCollisionOptionalParameters.PointsToCheck, TangentLeadInOut.LeadOut.ptPoint)
-      local bCollisionFoundTangent, bMoveAfterSplitTangent = PreSimulationLib.CheckCollision( sBladeEngagement, CheckCollisionParameters, CheckCollisionOptionalParameters)
+      local bCollisionFoundTangent, bMoveAfterSplitTangent = PreSimulationLib.CheckCollision( CheckCollisionParameters, CheckCollisionOptionalParameters)
       -- attacco tangenziale possibile
       if not bCollisionFoundTangent then
          LeadInOut.Tangent = TangentLeadInOut
@@ -468,6 +474,11 @@ end
 function MachiningLib.FindMill( Proc, ToolSearchParameters)
    local ToolInfo = {}
 
+   -- direzione utensile e fipo fresa obbligatori, altrimenti si esce
+   if not ToolSearchParameters.vtToolDirection or not ToolSearchParameters.sMillShape then
+      return ToolInfo
+   end
+
    local nBestToolIndex
    local dBestToolResidualDepth = 0
    for i = 1, #TOOLS do
@@ -512,6 +523,18 @@ function MachiningLib.FindMill( Proc, ToolSearchParameters)
          end
       end
       
+      -- TODO da sostituire con test collisione come lama
+      local bIsFromBottom = ToolSearchParameters.vtToolDirection:getZ() < - 10 * GEO.EPS_SMALL
+      local bIsFromTop = ToolSearchParameters.vtToolDirection:getZ() > 10 * GEO.EPS_SMALL
+      local bIsSlanted = abs( ToolSearchParameters.vtToolDirection:getY()) > 0.707
+      local bIsOnHeadOrTail = Proc.AffectedFaces.bLeft or Proc.AffectedFaces.bRight
+      if ( ( bIsFromBottom and TOOLS[i].SetupInfo.HeadType.bTop) or ( bIsFromTop and TOOLS[i].SetupInfo.HeadType.bBottom))
+         and ( not bIsSlanted)
+         and ( not bIsOnHeadOrTail) then
+
+         bIsToolCompatible = false
+      end
+
       -- scelgo il migliore
       if bIsToolCompatible then
          -- calcolo riduzione del massimo materiale utilizzabile
@@ -579,6 +602,7 @@ end
 -------------------------------------------------------------------------------------------------------------
 -- funzione per cercare utensile tipo LAMA con certe caratteristiche
 -- TODO da rivedere/completare
+-- TODO per Engagement serviranno (opzionali) sBlockedAxis e vtAux
 function MachiningLib.FindBlade( Proc, ToolSearchParameters)
    local ToolInfo = {}
 
@@ -604,9 +628,10 @@ function MachiningLib.FindBlade( Proc, ToolSearchParameters)
    local bForceLongcutBlade = ToolSearchParameters.bForceLongcutBlade or false
    local EdgeToMachine = ToolSearchParameters.EdgeToMachine
    local Part = ToolSearchParameters.Part
-   local bIsDicing = ToolSearchParameters.bIsDicing or false
+   local idCheckCollisionTm = ToolSearchParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = ToolSearchParameters.sRestLengthSideForPreSimulation or 'Tail'
    local bCannotSplitRestLength = ToolSearchParameters.bCannotSplitRestLength or false
+   local bDisableRealElevationCheck = ToolSearchParameters.bDisableRealElevationCheck or false
 
    local nBestToolIndex
    local dBestToolResidualDepth = 0
@@ -638,9 +663,10 @@ function MachiningLib.FindBlade( Proc, ToolSearchParameters)
                dDepthToMachine = min( dElevation, TOOLS[i].dMaxDepth)
             }
             local BladeEngagementOptionalParameters = {
-               bIsDicing = bIsDicing,
+               idCheckCollisionTm = idCheckCollisionTm,
                sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-               bCannotSplitRestLength = bCannotSplitRestLength
+               bCannotSplitRestLength = bCannotSplitRestLength,
+               bDisableRealElevationCheck = bDisableRealElevationCheck
             }
             TIMER:startElapsed( 'GetBladeEngagement')
             bIsBladeOk, CurrentEngagement = MachiningLib.GetBladeEngagement( BladeEngagementParameters, BladeEngagementOptionalParameters)
@@ -1443,7 +1469,7 @@ function MachiningLib.AddOperations( MACHININGS, Part, sRotation)
                   local idDisp = EgtGetPhaseDisposition( nPhase)
 
                   -- posizione iniziale considerando eventuiali prerotazioni
-                  local nRealInitialPosition = Part.nInitialPosition - ( BEAM.PREROTATE90 or 0)
+                  local nRealInitialPosition = Part.nInitialPosition
                   if sRotation == 'DOWN' then
                      local nRotation = EgtIf( nRealInitialPosition + 2 > 4, nRealInitialPosition + 2 - 4, nRealInitialPosition + 2) - 1
                      BeamLib.RotateRawPart( Part, nRotation)

LuaLibs/PreSimulationLib.lua

@@ -269,68 +269,117 @@ function PreSimulationLib.CheckOutOfStrokeFromGeometry( idGeometry, vtHead, nSCC
 end
 
 -------------------------------------------------------------------------------------------------------------
-local function CheckCollisionPoint( ptToolExitToCheck, vtC, vtHead, PreCollisionData, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, bCheckOnlyRestlength)
+local function MoveMachineAxesToPosition( ptOnToolTipCenter, vtHead, vtAux)
 
-   local ptPivot = GetGlobalPivot( ptToolExitToCheck, vtC, vtHead, PreCollisionData.vtMovePivot)
+   -- calcolo assi rotativi
+   local bOkAngles, nSolutionsAngles, RotativeAxesValues = EgtGetCalcAnglesEx( vtHead, vtAux)
+   local dRotative1 = RotativeAxesValues[1]
+   local dRotative2 = RotativeAxesValues[2]
+   local dRotative3 = RotativeAxesValues[3]
 
-   -- orientamento del riferimento locale
+   if not bOkAngles then
-   local vtDirectionX = PreCollisionData.Directions.vtDirectionX
+      error( ' MoveMachineAxesToPosition : error')
-   local vtDirectionY = PreCollisionData.Directions.vtDirectionY
+   end
-   local vtDirectionZ = PreCollisionData.Directions.vtDirectionZ
 
-   -- costruzione trimesh a partire dalla curva di collisione
+   -- calcolo assi lineari
-   -- recupero punti da macchina per costruire trimesh
+   local bOkPositions, _, dLinear1, dLinear2, dLinear3 = EgtGetCalcPositions( ptOnToolTipCenter, dRotative1, dRotative2, dRotative3)
-   local CollisionCurvePoints = PreCollisionData.Points
+
-   -- curva di collisione in riferimento locale
+   if not bOkPositions then
-   local idCollisionCurve = EgtCurveCompoFromPoints( Part.idTempGroup, CollisionCurvePoints)
+
-   -- curva in riferimento globale
+      error( ' MoveMachineAxesToPosition : error')
-   local frReference = Frame3d( ptPivot, vtDirectionZ, vtDirectionX)
+   end
-   EgtTransform( idCollisionCurve, frReference, GDB_RT.GLOB)
+
-   -- trimesh di collisione
+   local AxesNames = EgtGetAllCurrAxesNames()
-   local idCollisionSurfTm
+   local dTHome = EgtGetAxisHomePos( AxesNames[1])
-   if PreCollisionData.bSurfTmByRevolve then
+
-      idCollisionSurfTm = EgtSurfTmByRevolve( Part.idTempGroup, idCollisionCurve, ptPivot, vtDirectionY, true, 0.05, GDB_RT.GLOB)
+   -- spostamento assi in posizione (la T non si sposta perchè si sposta il pezzo)
-   else
+   EgtSetAxisPos( AxesNames[2], dLinear2)
-      local vtPreMove = -vtDirectionZ * ( PreCollisionData.dExtrusionDepth / 2)
+   EgtSetAxisPos( AxesNames[3], dLinear3)
-      EgtMove( idCollisionCurve, vtPreMove, GDB_RT.GLOB)
+   EgtSetAxisPos( AxesNames[4], dRotative1)
-      local vtExtrusion = vtDirectionZ * PreCollisionData.dExtrusionDepth
+   EgtSetAxisPos( AxesNames[5], dRotative2)
-      idCollisionSurfTm = EgtSurfTmByRegionExtrusion( Part.idTempGroup, idCollisionCurve, vtExtrusion, 0.05, GDB_RT.GLOB)
+   if dRotative3 then
+      EgtSetAxisPos( AxesNames[6], dRotative3)
+   end
+
+   return dLinear1 - dTHome
+end
+
+-------------------------------------------------------------------------------------------------------------
+local function CheckCollisionPoint( sAxis, ptOnToolTipCenter, vtHead, vtAux, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, idCheckCollisionTm)
+
+   -- spostamento assi macchina in posizione
+   local dDeltaXHeadOffset = MoveMachineAxesToPosition( ptOnToolTipCenter, vtHead, vtAux)
+
+   -- si recuperano gli id delle geometrie dell'asse con cui controllare la collisione
+   local idCollisionGroup = EgtGetFirstNameInGroup( EgtGetAxisId( sAxis), 'COLLISION')
+   local idCollisionGroupOther = EgtGetFirstNameInGroup( EgtGetAxisId( sAxis), 'OTHER_COLLISION') or GDB_ID.NULL
+   local CollisionGroupEntitiesId = EgtGetAllInGroup( idCollisionGroup)
+   local CollisionGroupOtherEntitiesId = EgtGetAllInGroup( idCollisionGroupOther)
+   -- si tengono solo gli elementi trimesh
+   local CollisionSurfTmId = {}
+   for i = 1, #CollisionGroupEntitiesId do
+      if EgtGetType( CollisionGroupEntitiesId[i]) == GDB_TY.SRF_MESH then
+         local idCollisionSurfTmCopy = EgtCopyGlob( CollisionGroupEntitiesId[i], Part.idTempGroup)
+         EgtMove( idCollisionSurfTmCopy, Vector3d( dDeltaXHeadOffset, 0, 0), GDB_RT.GLOB)
+         table.insert( CollisionSurfTmId, idCollisionSurfTmCopy)
+      end
+   end
+   -- se presenti geometrie nel gruppo other si aggiungono anche quelle
+   if CollisionGroupOtherEntitiesId and #CollisionGroupOtherEntitiesId > 0 then
+      for i = 1, #CollisionGroupOtherEntitiesId do
+         if EgtGetType( CollisionGroupOtherEntitiesId[i]) == GDB_TY.SRF_MESH then
+            local idCollisionOtherSurfTmCopy = EgtCopyGlob( CollisionGroupOtherEntitiesId[i], Part.idTempGroup)
+            EgtMove( idCollisionOtherSurfTmCopy, Vector3d( dDeltaXHeadOffset, 0, 0), GDB_RT.GLOB)
+            table.insert( CollisionSurfTmId, idCollisionOtherSurfTmCopy)
+         end
+      end
    end
 
    -- check collisione con pezzo
    local bCollisionFoundPiece = false
-   if not bCheckOnlyRestlength then
+   if not idCheckCollisionTm then
-      local idCheckCollisionTm = Part.idBoxTm
+      idCheckCollisionTm = Part.idBoxTm
       -- se testa o coda attaccate, si considerano nella superficie di collisione
       if bCannotSplitRestLength then
          local b3CheckCollision = BeamLib.GetPartBoxWithHeadTail( Part, sRestLengthSideForPreSimulation)
          idCheckCollisionTm = EgtSurfTmBBox( Part.idTempGroup, b3CheckCollision, false, GDB_RT.GLOB)
       end
-      bCollisionFoundPiece = EgtCDeSolidSolid( idCheckCollisionTm, idCollisionSurfTm, BeamData.COLL_SIC)
+   end
+   for i = 1, #CollisionSurfTmId do
+      bCollisionFoundPiece = EgtCDeSolidSolid( idCheckCollisionTm, CollisionSurfTmId[i], BeamData.COLL_SIC)
       if not type( bCollisionFoundPiece) == "boolean" then
          error( 'Presimulation fail')
       end
       if EgtGetDebugLevel() >= 3 and bCollisionFoundPiece then
-         EgtSetColor( idCollisionSurfTm, RED())
+         EgtSetColor( CollisionSurfTmId[i], RED())
+      end
+      if bCollisionFoundPiece then
+         break
+      end
    end
 
       -- se trovata collisione con pezzo è inutile procedere con il grezzo
       if bCollisionFoundPiece then
+
          return true
       end
-   end
 
    -- check collisione con grezzo restante, se con il pezzo non c'è collisione e non è un taglio di testa o coda
    local bCollisionFoundRestLength = false
    if not ( bCollisionFoundPiece or bCannotSplitRestLength) then
       local idRestLengthSurfFr = GetRestlengthSurfTm( Part, sRestLengthSideForPreSimulation)
       if idRestLengthSurfFr then
-         bCollisionFoundRestLength = EgtCDeSolidSolid( idRestLengthSurfFr, idCollisionSurfTm, BeamData.COLL_SIC)
+         for i = 1, #CollisionSurfTmId do
+            bCollisionFoundRestLength = EgtCDeSolidSolid( idRestLengthSurfFr, CollisionSurfTmId[i], BeamData.COLL_SIC)
             if not type( bCollisionFoundRestLength) == "boolean" then
                error( 'Presimulation fail')
             end
             if EgtGetDebugLevel() >= 3 and bCollisionFoundRestLength then
-            EgtSetColor( idCollisionSurfTm, ORANGE())
+               EgtSetColor( CollisionSurfTmId[i], ORANGE())
+            end
+            if bCollisionFoundRestLength then
+               break
+            end
          end
       end
    end
@@ -352,9 +401,10 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
 
    -- parametri opzionali
    OptionalParameters = OptionalParameters or {}
-   local bCheckOnlyRestlength = OptionalParameters.bCheckOnlyRestlength or false
+   local idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation or 'Tail'
    local bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength or false
+   local vtAux = OptionalParameters.vtAux
 
    -- se normale faccia non parallela a direzione testa c'è qualcosa che non va
    if not AreSameOrOppositeVectorApprox( vtNFace, vtHead) then
@@ -364,34 +414,19 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
    -- punti notevoli della lavorazione in cui fare il check
    local PointsToCheck = OptionalParameters.PointsToCheck or GetCollisionPointsToCheck( Edge, dDepthToMachine)
 
-   -- punti in centro lama su naso mandrino o aggregato. In base a direzione e punto
+   -- punti sul tip dell'utensile, in centro
-   local bIsDownUp = AreOppositeVectorApprox( vtNFace, vtHead)
+   local PointsOnToolTipCenter = {}
-   local ToolExitPoints = {}
    for i = 1, #PointsToCheck do
-      ToolExitPoints[i] = GetToolExitPoint( PointsToCheck[i], Edge.vtN, vtHead, Tool, bIsDownUp)
+      PointsOnToolTipCenter[i] = PreSimulationLib.GetPointOnToolTipCenter( PointsToCheck[i], vtHead, vtNFace, Edge.vtN, Tool)
    end
 
-   -- vtC punta sempre verso il corpo dell'asse C o verso l'aggregato
-   local nSCC = Tool.SetupInfo.GetSCC( Edge.vtN, Edge.vtEdge, vtNFace)
-   local vtSCC = BeamLib.GetDirectionFromSCC( nSCC)
-   local vtC = vtHead ^ Tool.SetupInfo.vtRotationAxisC
-   vtC:normalize()
-   if vtC:isSmall() then
-      vtC = vtSCC
-   elseif vtC * vtSCC < GEO.EPS_SMALL then
-      vtC = -vtC
-   end
-
-   -- punti curva collisione e direzioni check da macchina
-   local PreCollisionData = Tool.SetupInfo.GetPreCollisionData( sAxis, vtC, vtHead)
-
    local bMoveAfterSplit = false
 
    -- se almeno in un punto c'è collisione con il pezzo si ritorna collisione
    -- se non si trova collisione si ritorna se è necessario separare prima di effettuare la lavorazione (ossia non c'è collisione con il pezzo ma c'è con il grezzo restante)
-   for i = 1, #ToolExitPoints do
+   for i = 1, #PointsOnToolTipCenter do
 
-      local bCollisionFoundPiece, bCollisionFoundRestLength = CheckCollisionPoint( ToolExitPoints[i], vtC, vtHead, PreCollisionData, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, bCheckOnlyRestlength)
+      local bCollisionFoundPiece, bCollisionFoundRestLength = CheckCollisionPoint( sAxis, PointsOnToolTipCenter[i], vtHead, vtAux, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, idCheckCollisionTm)
 
       -- se trovata collisione con pezzo è inutile controllare gli altri punti
       if bCollisionFoundPiece then
@@ -410,29 +445,33 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
 end
 
 -------------------------------------------------------------------------------------------------------------
-function PreSimulationLib.CheckCollision( sBladeEngagement, Parameters, OptionalParameters)
+function PreSimulationLib.CheckCollision( Parameters, OptionalParameters)
 
    local bCollisionFound
-   local bMoveAfterSplitZ, bMoveAfterSplitC, bMoveAfterSplitAB
+   local bMoveAfterSplitL3, bMoveAfterSplitR3, bMoveAfterSplitR2, bMoveAfterSplitR1
+
+   -- parametri obbligatori
+   local Edge = Parameters.Edge
+   local vtNFace = Parameters.vtNFace
+   local Tool = Parameters.Tool
 
    -- parametri opzionali, in parte da far transitare
    OptionalParameters = OptionalParameters or {}
 
    local OptionalParametersCheckCollisionWithAxis = {}
-   OptionalParametersCheckCollisionWithAxis.bCheckOnlyRestlength = false
    OptionalParametersCheckCollisionWithAxis.PointsToCheck = OptionalParameters.PointsToCheck or nil
    OptionalParametersCheckCollisionWithAxis.sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation or 'Tail'
    OptionalParametersCheckCollisionWithAxis.bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength or false
+   OptionalParametersCheckCollisionWithAxis.sBlockedAxis = OptionalParameters.sBlockedAxis
+   OptionalParametersCheckCollisionWithAxis.vtAux = OptionalParameters.vtAux
+   OptionalParametersCheckCollisionWithAxis.idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
 
-   local bIsDicing = OptionalParameters.bIsDicing or false
+   local sBlockedAxis = OptionalParameters.sBlockedAxis
-   local bCheckOnlyRestlengthForAxisABC = false
+   local bDisableRealElevationCheck = OptionalParameters.bDisableRealElevationCheck or false
 
-   -- se cubetti in modalità standard (no DownUp) gli assi AB e C si controllano solo con grezzo (ci sarebbe collisione con il materiale già rimosso controllando AB e C con pezzo)
-   if bIsDicing and ( sBladeEngagement == 'Standard') then
-      bCheckOnlyRestlengthForAxisABC = true
    -- se l'elevazione reale (rispetto al pezzo + eventuale materiale in testa/coda) è maggiore del massimo materiale è sempre collisione
    -- TODO rifare con funzione
-   else
+   if not bDisableRealElevationCheck then
       local Edge = Parameters.Edge
       local vtNFace = Parameters.vtNFace
       local dDepthToMachine = Parameters.dDepthToMachine
@@ -455,21 +494,43 @@ function PreSimulationLib.CheckCollision( sBladeEngagement, Parameters, Optional
       end
    end
 
-   -- asse Z si controlla sempre
+   -- SCC
-   bCollisionFound, bMoveAfterSplitZ = CheckCollisionWithAxis( 'Z', Parameters, OptionalParametersCheckCollisionWithAxis)
+   local nSCC = Tool.SetupInfo.GetSCC( Edge.vtN, Edge.vtEdge, vtNFace)
 
-   -- assi AB e C: se richiesto si controlla la collisione solo col grezzo
+   -- si settano utensile, SCC e asse bloccato per il controllo collisione
-   OptionalParametersCheckCollisionWithAxis.bCheckOnlyRestlength = bCheckOnlyRestlengthForAxisABC
+   local bOkTool = EgtSetCalcTool( Tool.sName, Tool.sHead, Tool.nExit)
+   if not bOkTool then
+      error( 'CheckCollisionWithAxis : cannot set calc tool')
+   end
+   EgtSetCalcSolCh( nSCC)
+   if sBlockedAxis and type( sBlockedAxis) == "string" then
+      local BlockedAxis = EgtSplitString( sBlockedAxis, '=')
+      EgtSetRotAxisBlock( BlockedAxis[1], tonumber( BlockedAxis[2]))
+   end
 
-   if not bCollisionFound then
+   -- nomi degli assi con cui controllare la collisione
-      bCollisionFound, bMoveAfterSplitAB = CheckCollisionWithAxis( 'AB', Parameters, OptionalParametersCheckCollisionWithAxis)
+   local AxesNames = EgtGetAllCurrAxesNames()
+   local sL3 = AxesNames[3]
+   local sR3 = AxesNames[6]
+   local sR2 = AxesNames[5]
+   local sR1 = AxesNames[4]
+
+   -- ultimo asse lineare prima dei rotativi (solitamente Z) si controlla sempre
+   bCollisionFound, bMoveAfterSplitL3 = CheckCollisionWithAxis( sL3, Parameters, OptionalParametersCheckCollisionWithAxis)
+
+   if sR3 and not bCollisionFound then
+      bCollisionFound, bMoveAfterSplitR3 = CheckCollisionWithAxis( sR3, Parameters, OptionalParametersCheckCollisionWithAxis)
    end
 
    if not bCollisionFound then
-      bCollisionFound, bMoveAfterSplitC = CheckCollisionWithAxis( 'C', Parameters, OptionalParametersCheckCollisionWithAxis)
+      bCollisionFound, bMoveAfterSplitR2 = CheckCollisionWithAxis( sR2, Parameters, OptionalParametersCheckCollisionWithAxis)
    end
 
-   local bMoveAfterSplit = bMoveAfterSplitZ or bMoveAfterSplitC or bMoveAfterSplitAB
+   if not bCollisionFound then
+      bCollisionFound, bMoveAfterSplitR1 = CheckCollisionWithAxis( sR1, Parameters, OptionalParametersCheckCollisionWithAxis)
+   end
+
+   local bMoveAfterSplit = bMoveAfterSplitL3 or bMoveAfterSplitR3 or bMoveAfterSplitR2 or bMoveAfterSplitR1
 
    return bCollisionFound, bMoveAfterSplit
 end

Process.lua

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

Strategies/AvailableStrategyList.json

@@ -688,7 +688,7 @@
       "TopologyList" : [
          {  "sName": "Feature",
             "sImage": "ConfigStrategy\\ScarfJoint.png",
-            "StrategyList" : [ ]
+            "StrategyList" : [ { "sStrategyId": "STR0009" }]
          }
       ]
    },

Strategies/Standard/STR0001/STR0001.lua

@@ -87,6 +87,7 @@ local function GetTenonStrategy( Proc, Part)
       ToolSearchParameters.dElevation = EgtSurfTmFacetElevationInBBox( Strategy.idTenonCutPlane, 0, Part.b3Part, true, GDB_ID.ROOT)
 
       ToolSearchParameters.vtToolDirection = Proc.FeatureInfo.vtTenonN
+      ToolSearchParameters.sMillShape = 'STANDARD'
       ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sPocketingList, 'Pocketing')
       Machining.Cutting.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
 

Strategies/Standard/STR0002/STR0002.lua

@@ -269,6 +269,8 @@ local function GetBestPocketingStrategy( Proc, Part)
          Milling.idProc = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.id
          Milling.dElevation = ( Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].dElevation * 2) + BeamData.MILL_OVERLAP
          Milling.bMachAppliedToTunnelFace = true
+      else
+         ToolSearchParameters.vtToolDirection = nil
       end
       ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sPocketingList, 'Pocketing')
       Milling.ToolInfo = {}
@@ -278,6 +280,19 @@ local function GetBestPocketingStrategy( Proc, Part)
          local ParametersMRR = {}
          ParametersMRR.nToolIndex = Milling.ToolInfo.nToolIndex
          Milling.dMRR = MachiningLib.GetToolMRR( ParametersMRR)
+         -- se la faccia tunnel è troppo piccola non si lavora
+         if Milling.bMachAppliedToTunnelFace then
+            local dLongestEdgeLength = 0
+            for i = 1, #Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges do
+               if Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges[i].dLength > dLongestEdgeLength + 10 * GEO.EPS_SMALL then
+                  dLongestEdgeLength = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges[i].dLength
+               end
+            end
+            if dLongestEdgeLength < TOOLS[Milling.ToolInfo.nToolIndex].dDiameter then
+               Milling.bIsApplicable = false
+               ParametersMRR = {}
+            end
+         end
       end
    end
    table.insert( Machining, Milling)
@@ -309,6 +324,8 @@ local function GetBestPocketingStrategy( Proc, Part)
          Milling.idFaceToMachine = Proc.MainFaces.SideFaces[1].id
          Milling.idProc = Proc.id
          Milling.dElevation = Proc.MainFaces.SideFaces[1].dElevation
+      else
+         ToolSearchParameters.vtToolDirection = nil
       end
       ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sPocketingList, 'Pocketing')
       Milling.ToolInfo = {}
@@ -318,6 +335,19 @@ local function GetBestPocketingStrategy( Proc, Part)
          local ParametersMRR = {}
          ParametersMRR.nToolIndex = Milling.ToolInfo.nToolIndex
          Milling.dMRR = MachiningLib.GetToolMRR( ParametersMRR)
+         -- se la faccia tunnel è troppo piccola non si lavora
+         if Milling.bMachAppliedToTunnelFace then
+            local dLongestEdgeLength = 0
+            for i = 1, #Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges do
+               if Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges[i].dLength > dLongestEdgeLength + 10 * GEO.EPS_SMALL then
+                  dLongestEdgeLength = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].Edges[i].dLength
+               end
+            end
+            if dLongestEdgeLength < TOOLS[Milling.ToolInfo.nToolIndex].dDiameter then
+               Milling.bIsApplicable = false
+               ParametersMRR = {}
+            end
+         end
       end
    end
    table.insert( Machining, Milling)

Strategies/Standard/STR0003/STR0003.lua

@@ -195,6 +195,17 @@ function STR0003.Make( bAddMachining, Proc, Part, CustomParameters)
    Blade.Result = {}
    Chainsaw.Result = {}
 
+
+   -- se arriva una feature senza MainFaces o MainEdges necessari la strategia non è applicabile
+   -- TODO riuniure a IsTopologyOk?
+   if not Proc.MainFaces
+      or not Proc.MainFaces.LongFaces[1]
+      or not Proc.MainFaces.LongFaces[1].MainEdges then
+
+      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable( 'Topology')
+      return false, Strategy.Result
+   end
+
    if not IsTopologyOk( Proc) then
       local sErr = 'Feature '.. Proc.idFeature .. ' : strategy ' .. Strategy.sName .. ' not implemented'
       EgtOutLog( sErr)
@@ -241,16 +252,6 @@ function STR0003.Make( bAddMachining, Proc, Part, CustomParameters)
       dPocketHeight = Proc.MainFaces.BottomFaces[1].MainEdges.SideEdges[1].dLength
    end
 
-   -- se arriva una feature senza MainFaces o MainEdges necessari la strategia non è applicabile
-   -- TODO riuniure a IsTopologyOk?
-   if not Proc.MainFaces
-      or not Proc.MainFaces.LongFaces[1]
-      or not Proc.MainFaces.LongFaces[1].MainEdges then
-
-      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable( 'Topology')
-      return false, Strategy.Result
-   end
-
    -- riferimenti locali per leggibilità e performance
    local LongFace = Proc.MainFaces.LongFaces[1]
    local OppositeEdge1 = LongFace.MainEdges.OppositeEdges[1]

Strategies/Standard/STR0004/STR0004.lua

@@ -132,6 +132,16 @@ function STR0004.Make( bAddMachining, Proc, Part, CustomParameters)
       bIsSplitFeature = true
    end
 
+   -- se arriva una feature senza MainFaces o MainEdges necessari la strategia non è applicabile
+   -- TODO riuniure a IsTopologyOk?
+   if not Proc.MainFaces
+      or not Proc.MainFaces.LongFaces[1]
+      or not Proc.MainFaces.LongFaces[1].MainEdges then
+
+      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable( 'Topology')
+      return false, Strategy.Result
+   end
+
    -- altezza tasca
    local dPocketHeight = 0
    if Proc.Topology.sFamily == 'Tunnel' then
@@ -145,16 +155,6 @@ function STR0004.Make( bAddMachining, Proc, Part, CustomParameters)
       dPocketHeight = Proc.MainFaces.BottomFaces[1].MainEdges.SideEdges[1].dLength
    end
 
-   -- se arriva una feature senza MainFaces o MainEdges necessari la strategia non è applicabile
-   -- TODO riuniure a IsTopologyOk?
-   if not Proc.MainFaces
-      or not Proc.MainFaces.LongFaces[1]
-      or not Proc.MainFaces.LongFaces[1].MainEdges then
-
-      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable( 'Topology')
-      return false, Strategy.Result
-   end
-
    -- riferimenti locali per leggibilità e performance
    local LongFace = Proc.MainFaces.LongFaces[1]
    local OppositeEdge1 = LongFace.MainEdges.OppositeEdges[1]

Strategies/Standard/STR0007/STR0007.lua

@@ -441,7 +441,7 @@ function STR0007.Make( bAddMachining, Proc, Part, CustomParameters)
       local ptCutC, vtCutN = EgtSurfTmFacetCenter( Proc.id, 1, GDB_ID.ROOT)
       if ptCutC and vtCutN and AreSameVectorApprox( Proc.FeatureInfo.vtMortiseN, vtCutN) then
          -- recupero gruppo per geometria addizionale
-         local nAddGrpId = Part.idTempGroup
+         local nAddGrpId = BeamLib.GetAddGroup( Part.id)
          Strategy.idMortiseCutPlane = EgtSurfTmPlaneInBBox( nAddGrpId, ptCutC, vtCutN, Part.b3Part, GDB_RT.GLOB)
       end
    end

Strategies/Standard/STR0008/STR0008.lua

@@ -311,10 +311,7 @@ function STR0008.Make( bAddMachining, Proc, Part, CustomParameters)
       -- si applicano le lavorazioni di svuotatura
       for i = 1, #Strategy.Machining.Pocketing do
          if Strategy.Machining.Pocketing[i].bIsApplicable then
-            Pocketing = {}
+            Pocketing = MachiningLib.InitMachiningParameters( MCH_MY.POCKETING)
-            Pocketing.Steps = {}
-            Pocketing.LeadIn = {}
-            Pocketing.nType = MCH_MY.POCKETING
             Pocketing.nSubType = MCH_POCK_SUB.SPIRALOUT
             Pocketing.LeadIn.nType = MCH_POCK_LI.ZIGZAG
             Pocketing.Steps.dStep = TOOLS[Strategy.Machining.Pocketing[i].ToolInfo.nToolIndex].dStep

Strategies/Standard/STR0009/STR0009.json

@@ -1,6 +1,6 @@
 {
    "sStrategyId": "STR0009",
-   "sStrategyName": "Mill Heading",
+   "sStrategyName": "ScarfJoint",
    "ParameterList" : [
       {
          "sName": "dDepthChamfer",
@@ -13,35 +13,15 @@
          "sMinUserLevel": "1"
       },
       {
-         "sName": "dOverMaterial",
+         "sName": "bAntiSplint",
-         "sNameNge": "OVERMAT",
+         "sNameNge": "ANTISPLINT",
-         "sValue": "0",
-         "sDescriptionShort": "Overmaterial",
-         "sDescriptionLong": "",
-         "sType": "d",
-         "sMessageId": " ",
-         "sMinUserLevel": "1"
-      },
-      {
-         "sName": "bForceStrip",
-         "sNameNge": "FORCE_STRIP",
          "sValue": "false",
-         "sDescriptionShort": "Force strip",
+         "sDescriptionShort": "Use Anti-Splint strategy",
-         "sDescriptionLong": "Enable the parameter to force the software to leave a strip to sustain the piece",
+         "sDescriptionLong": "The strategy will apply blade cuts on corner to avoid wood splint",
          "sType": "b",
          "sMessageId": " ",
          "sMinUserLevel": "1"
       },
-      {
-         "sName": "dStripWidth",
-         "sNameNge": "STRIP_WIDTH",
-         "sValue": "0",
-         "sDescriptionShort": "Strip width",
-         "sDescriptionLong": "Width of the strip in case if foreseen from the machining",
-         "sType": "d",
-         "sMessageId": " ",
-         "sMinUserLevel": "1"
-      },
       {
          "sName": "sMillingList",
          "sNameNge": "PROFILE_TOOL_LIST",

Strategies/Standard/STR0009/STR0009.lua

@@ -1,7 +1,6 @@
 -- Strategia: STR0009
 -- Descrizione 
--- Fresatura di contorno
+-- Feature tipo ScarfJoint
--- Feature tipo Arco
 
 
 -- carico librerie
@@ -11,155 +10,181 @@ local MachiningLib = require( 'MachiningLib')
 local FeatureLib = require( 'FeatureLib')
 -- strategie di base
 local BladeToWaste = require( 'BLADETOWASTE')
+local FaceByMill = require( 'FACEBYMILL')
+local FaceByBlade = require( 'FACEBYBLADE')
+local AntiSplintOnFace = require( 'ANTISPLINTONFACE')
 
 -- Tabella per definizione modulo
 local STR0009 = {}
 local Strategy = {}
 
 -------------------------------------------------------------------------------------------------------------
--- TODO gestire il caso in cui non si trova l'utensile
+local function GetFacesIdOrder( Proc, Part)
-local function GetArcStrategy( Proc, Part)
+   local Faces = {}
-   local Machining = {}
+   if Proc.nFct == 5 then
+      -- carico gli id delle facce
+      for i = 1, Proc.nFct do
+         Faces[#Faces + 1] = BeamLib.TableCopyDeep( Proc.Faces[i])
+      end
+   elseif Proc.nFct == 4 then
+      local vtN1 = Proc.Faces[1].vtN
+      local vtN2 = Proc.Faces[2].vtN
+      local nIndex = EgtIf( abs( vtN1:getX()) > abs( vtN2:getX()), 1, 2)
+      for i = nIndex, Proc.nFct do
+         Faces[#Faces + 1] = BeamLib.TableCopyDeep( Proc.Faces[i])
+      end
+   -- TODO manca il caso in cui mancano facce 4 e 5
+   else -- Proc.nFct == 3
+      for i = 2, Proc.nFct do
+         Faces[#Faces + 1] = BeamLib.TableCopyDeep( Proc.Faces[i])
+      end
+   end
+
+   return Faces
+end
+
+-------------------------------------------------------------------------------------------------------------
+local function GetEdgeToMachine( ClosingFace, idBottomFace)
+   local EdgeToMachine
+
+   for i = 1, #ClosingFace.Edges do
+      if ClosingFace.Edges[i].idAdjacentFace == idBottomFace then
+         EdgeToMachine = ClosingFace.Edges[i]
+         break
+      end
+   end
+
+   return EdgeToMachine
+end
+
+-------------------------------------------------------------------------------------------------------------
+local function GetScarfJointStrategy( Proc, Part)
+   -- ordino le facce in base al loro numero e al parallelismo delle due facce principali
+   -- faccia 0: superficie tappo (*potrebbe non esserci)
+   -- faccia 1: superficie principale di fondo
+   -- faccia 2: superficie opposta alla faccia 1
+   -- faccia 3: superficie principale superiore
+   -- faccia 4: superficie di testa (*potrebbe non esserci)
+   -- creo una tabella unica contenente tutte le lavorazioni
+   local Result = {}
+   local Cutting = { Machinings = {}, Result = {}}
+   local AntiSplints = {}
+   local Pocketing = {}
+
+   Result.dTimeToMachine = 0
+   local Faces = GetFacesIdOrder( Proc)
+   -- taglio su faccia 4
+   if Faces[4] and Faces[4].vtN then
+      -- recupero gruppo per geometria addizionale
+      local nAddGrpId = BeamLib.GetAddGroup( Part.id)
+      -- TODO la nuova faccia creata sulla 4 può tagliare faccia 1. In caso tagliasse faccia 1, bisogna calcolare i cubetti con 2 facce 
+      Strategy.idFeatureCutPlane = EgtSurfTmPlaneInBBox( nAddGrpId, Faces[4].ptCenter, Faces[4].vtN, Part.b3Part, GDB_RT.GLOB)
+      Cutting.Machinings, Cutting.Result = BladeToWaste.Make( Strategy.idFeatureCutPlane, Part)
+      if Cutting.Result.sStatus == 'Completed' then
+         Cutting.Machinings.bIsApplicable = true
+      end
+   end
+
+   -- antischeggia facce 1 e 3
+   local bAreAllAntisplintsApplicable = true
+   if Strategy.Parameters.bAntiSplint then
+      AntiSplints = AntiSplintOnFace.Make( Proc, Part, Faces[2])
+      for k = 1, #AntiSplints do
+         if not AntiSplints[k].bIsApplicable then
+            bAreAllAntisplintsApplicable = false
+            break
+         end
+      end
+   end
+
+   -- svuotatura faccia 2
+   if Faces[2] then
+      local frPock, dL, dW = EgtSurfTmFacetMinAreaRectangle( Proc.id, Faces[2].id, GDB_ID.ROOT)
       local ToolSearchParameters = {}
+      ToolSearchParameters.sMillShape = 'STANDARD'
+      ToolSearchParameters.vtToolDirection = Faces[2].vtN
+      ToolSearchParameters.dElevation = abs( ( Faces[2].ptCenter - Faces[4].ptCenter) * Faces[2].vtN)
+      ToolSearchParameters.dMaxToolDiameter = min( dL, dW)
+      ToolSearchParameters.ToolInfo = {}
+      ToolSearchParameters.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
+      if ToolSearchParameters.ToolInfo.nToolIndex then
+         local Machining = MachiningLib.InitMachiningParameters( MCH_MY.POCKETING)
+         Machining.Geometry = {{ Proc.id, Faces[2].id}}
+         Machining.dElevation = ToolSearchParameters.dElevation
+         Machining.dMaxElev = Machining.dElevation
+         Machining.vtToolDirection = ToolSearchParameters.vtToolDirection
+         Machining.nSubType = MCH_POCK_SUB.SPIRALIN
+         Machining.LeadIn.nType = MCH_POCK_LI.ZIGZAG
+         Machining.Steps.dStep = TOOLS[ToolSearchParameters.ToolInfo.nToolIndex].dStep
+         Machining.Steps.dSideStep = TOOLS[ToolSearchParameters.ToolInfo.nToolIndex].dSideStep
+         Machining.nToolIndex = ToolSearchParameters.ToolInfo.nToolIndex
+         Machining.LeadIn.dTangentDistance = TOOLS[ToolSearchParameters.ToolInfo.nToolIndex].dDiameter / 2
+         Machining.LeadIn.dElevation = TOOLS[ToolSearchParameters.ToolInfo.nToolIndex].dDiameter / 2
+         Machining.sDepth = 0
+         Machining.dResidualDepth = ToolSearchParameters.ToolInfo.dResidualDepth
+         -- TODO vedere se questo parametro con svuotature nuove si può rimuovere
+         Machining.dOpenMinSafe = Strategy.Parameters.dOpenMinSafe
+         Machining.dTimeToMachine = MachiningLib.GetTimeToMachineAllStepsWithLeadInOut( Machining, Part)
+         Result.dTimeToMachine = Result.dTimeToMachine + Machining.dTimeToMachine
+         table.insert( Pocketing, Machining)
+         Pocketing.bIsApplicable = true
+         -- se non sono stati fatti i passaggi antischeggia si verifica che le facce siano a 90°, altrimenti serve passaggio con fresa
+         if not Strategy.Parameters.bAntiSplint or not bAreAllAntisplintsApplicable then
+            local dAngleBetweenFaces = Proc.AdjacencyMatrix[1][2] or 0
+            -- si fa passaggio con fresa
+            if dAngleBetweenFaces > -90 then
+               local EdgeToMachine = GetEdgeToMachine( Faces[1], Faces[2].id)
+               local CuttingClosingFace = FaceByBlade.Make( Proc, Part, Faces[1], EdgeToMachine)
+               if CuttingClosingFace.bIsApplicable then
+                  table.insert( AntiSplints, CuttingClosingFace)
+               end
+            end
+         end
+      end
+   end
 
-   -- recupero e verifico l'entità curva
+   -- se manca taglio principale, feature non eseguibile
-   local idAux = EgtGetInfo( Proc.id, 'AUXID', 'i')
+   if not Cutting.Machinings.bIsApplicable then
-   if idAux then idAux = idAux + Proc.id end
+      local sErr = 'Feature '.. Proc.idFeature .. ' : strategy ' .. Strategy.sName .. ' not applicable'
-   if not idAux  or  ( EgtGetType( idAux) & GDB_FY.GEO_CURVE) == 0 then
-      local sErr = 'Error on process ' .. tostring( Proc.id) .. ' missing profile geometry'
       EgtOutLog( sErr)
-      return false, sErr
+      Result = FeatureLib.GetStrategyResultNotApplicable( sErr)
-   end
-   Proc.idAddAuxGeom = idAux
-
-   -- recupero i dati della curva e del profilo
-   local dDepth = abs( EgtCurveThickness( idAux))
-   local vtExtr = EgtCurveExtrusion( idAux, GDB_RT.GLOB)
-   local bToolInvert = ( vtExtr:getZ() < -0.1)
-   local bIsHorizontal = abs( vtExtr:getZ()) < 10 * GEO.EPS_SMALL
-   local bIsFeatureDown = Proc.AffectedFaces.bBottom and not Proc.AffectedFaces.bTop
-   local bIsFeatureBack = Proc.AffectedFaces.bBack and not Proc.AffectedFaces.bFront
-   local bForceStrip = Strategy.Parameters.bForceStrip
-   local dDimStrip = EgtIf( Strategy.Parameters.dStripWidth < 100 * GEO.EPS_SMALL, nil, Strategy.Parameters.dStripWidth)
-
-   local bExecStrip = false
-   -- se la lavorazione si trova nella parte inferiore o in battuta dietro, il codolo va sempre lasciato
-   if bIsFeatureDown or bIsFeatureBack or bForceStrip then
-      if bIsFeatureDown or bIsFeatureBack then
-         dDimStrip = dDimStrip or max( BeamData.DIM_STRIP or 5, 5)
    else
-         dDimStrip = dDimStrip or max( BeamData.DIM_STRIP_SMALL or 5, 1)
+      local dCompletionPercentage = 100
-      end
+      -- completa se svuotatura eseguita e antisplit eseguiti (o non richiesti)
-      bExecStrip = true
+      if Pocketing.bIsApplicable and ( bAreAllAntisplintsApplicable or not Strategy.Parameters.bAntiSplint) then
-   end
+         Result.sStatus = 'Completed'
-   if not bExecStrip then
+         if bAreAllAntisplintsApplicable then
-      dDimStrip = 0
+            Result.dQuality = FeatureLib.GetStrategyQuality( 'FINE')
-   end
-
-   -- se lavorazione orizzontale
-   if bIsHorizontal then
-      local bDouble
-      local Milling = MachiningLib.InitMachiningParameters( MCH_MY.MILLING)
-      Milling.bIsApplicable = false
-      ToolSearchParameters = {}
-      ToolSearchParameters.sMillShape = 'STANDARD'
-      ToolSearchParameters.dElevation = EgtIf( bExecStrip, ( dDepth - dDimStrip) / 2, dDepth + BeamData.MILL_OVERLAP)
-      ToolSearchParameters.vtToolDirection = EgtIf( bToolInvert, -vtExtr, vtExtr)
-      ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sMillingList, 'Milling')
-      Milling.ToolInfo = {}
-      Milling.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
-      -- se posso lavorare in una passata, ma utensile trovato non completa la lavorazione,
-      -- allora provo a cercare utensile con massimo materiale sufficiente per fare le due passate, magari trova un utensile più prestante
-      if Milling.ToolInfo.dResidualDepth > 10 * GEO.EPS_SMALL and not bExecStrip then
-         bDouble = true
-         ToolSearchParameters.dElevation = ( dDepth + BeamData.MILL_OVERLAP) / 2
-         ToolSearchParameters.vtToolDirection = EgtIf( bToolInvert, -vtExtr, vtExtr)
-      end
-      Milling.bToolInvert = bToolInvert
-      Milling.vtToolDirection = vtExtr
-
-      if bDouble or bExecStrip then
-         if bDouble then
-            Milling.sDepth = ( dDepth + BeamData.MILL_OVERLAP) / 2
          else
-            Milling.sDepth = ( dDepth - dDimStrip) / 2
+            Result.dQuality = FeatureLib.GetStrategyQuality( 'STD')
          end
-         table.insert( Machining, Milling)
+      -- altrimenti non completa
-         local Milling2 = BeamLib.TableCopyDeep( Milling)
-         table.insert( Machining, Milling2)
       else
-         Milling.sDepth = dDepth + BeamData.MILL_OVERLAP
+         Result.dQuality = FeatureLib.GetStrategyQuality( 'STD')
-         table.insert( Machining, Milling)
+         Result.sStatus = 'Not-Completed'
-      end
+         -- se fa solo svuotatura
-   -- se lavorazione verticale
+         if Pocketing.bIsApplicable then
+            dCompletionPercentage = 90
+            Result.sInfo = 'Anti-Split not executed'
+         elseif Strategy.Parameters.bAntiSplint and bAreAllAntisplintsApplicable then
+            dCompletionPercentage = 75
+            Result.sInfo = 'Pocketing not executed'
          else
-      -- si cerca utensile 1
+            dCompletionPercentage = 50
-      local Milling = {}
+            Result.sInfo = 'Only the cut has been executed'
-      Milling.bIsApplicable = false
-      ToolSearchParameters = {}
-      ToolSearchParameters.sMillShape = 'STANDARD'
-      ToolSearchParameters.dElevation = dDepth + BeamData.MILL_OVERLAP
-      ToolSearchParameters.vtToolDirection = EgtIf( bToolInvert, -vtExtr, vtExtr)
-      ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sMillingList, 'Milling')
-      Milling.ToolInfo = {}
-      Milling.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
-      -- si cerca utensile 2
-      local Milling2 = {}
-      Milling2.bIsApplicable = false
-      ToolSearchParameters = {}
-      ToolSearchParameters.sMillShape = 'STANDARD'
-      ToolSearchParameters.dElevation = dDepth + BeamData.MILL_OVERLAP
-      ToolSearchParameters.vtToolDirection = EgtIf( bToolInvert, vtExtr, -vtExtr)
-      ToolSearchParameters.AvailableToolList = MachiningLib.GetAvailableToolList( Proc, Strategy.Parameters.sMillingList, 'Milling')
-      Milling2.ToolInfo = {}
-      Milling2.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
-
-      -- se serve codolo
-      if bExecStrip then
-         -- se a disposizione entrambi gli utensili
-         if Milling.ToolInfo.nToolIndex and Milling2.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling)
-            table.insert( Machining, Milling2)
-         -- se disponibile solo primo utensile
-         elseif Milling.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling)
-         -- se disponibile solo secondo utensile
-         elseif Milling2.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling2)
-         -- nessun utensile disponibile
-         else
-         -- non si fa nulla
-         end
-      -- altrimenti senza codolo
-      else
-         -- se utensile 1 esegue completamente
-         if Milling.ToolInfo.nToolIndex and Milling.ToolInfo.dResidualDepth < 10 * GEO.EPS_SMALL then
-            table.insert( Machining, Milling)
-         -- se utensile 2 esegue completamente
-         elseif Milling2.ToolInfo.nToolIndex and Milling2.ToolInfo.dResidualDepth < 10 * GEO.EPS_SMALL then
-            table.insert( Machining, Milling2)
-         -- se possono lavorare entrambi
-         elseif Milling.ToolInfo.nToolIndex and Milling2.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling)
-            table.insert( Machining, Milling2)
-         -- se utensile 1 non completo
-         elseif Milling.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling)
-            -- se utensile 2 non completo
-         elseif Milling2.ToolInfo.nToolIndex then
-            table.insert( Machining, Milling2)
-         end
          end
       end
 
-   -- TODO VOTO DA FARE!!!!
+      Result.dCompletionIndex = FeatureLib.GetFeatureCompletionIndex( dCompletionPercentage)
-   Strategy.Result.sStatus = 'Completed'
+   end
-   Strategy.Result.dCompletionIndex = 5
-   Strategy.Result.dMRR = MachiningLib.GetToolMRR( Machining[1].ToolInfo or Machining[2].ToolInfo)
-   Strategy.Result.dQuality = FeatureLib.GetStrategyQuality( 'MILL')
-   Strategy.Result.sInfo = ''
 
-   return Machining
+   -- creo una tabella unica contenente tutte le lavorazioni
+   local Machinings = {}
+   EgtJoinTables( Machinings, Cutting.Machinings)
+   EgtJoinTables( Machinings, AntiSplints)
+   EgtJoinTables( Machinings, Pocketing)
+
+   return Machinings, Result
 end
 
 -------------------------------------------------------------------------------------------------------------
@@ -173,78 +198,32 @@ function STR0009.Make( bAddMachining, Proc, Part, CustomParameters)
    Strategy.Result = {}
 
    local bAreAllMachiningsAdded = true
-   local Milling = {}
 
-   Strategy.Machinings = GetArcStrategy( Proc, Part)
+   -- controlli preliminari
+   if Proc.nFct < 3 or Proc.nFct > 5 then
+      local sErr = 'Feature '.. Proc.idFeature .. ' : strategy ' .. StrategyLib.Config.sStrategyId .. ' not applicable'
+      EgtOutLog( sErr)
+      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable( sErr)
+      return false, Strategy.Result
+   end
 
+   Strategy.Machinings, Strategy.Result = GetScarfJointStrategy( Proc, Part)
+
+   -- aggiunta lavorazioni
+   if #Strategy.Machinings > 0 then
       if bAddMachining and Strategy.Result.sStatus ~= 'Not-Applicable' then
-      -- eventuali punti di spezzatura
-      local FeatureSplittingPoints = FeatureLib.GetFeatureSplittingPoints( Proc, Part)
-
-      for i = 1, #Strategy.Machinings do
-
-         Strategy.Machinings[i].Geometry = {{ Proc.idAddAuxGeom, -1}}
-         Strategy.Machinings[i].nToolIndex = Strategy.Machinings[i].ToolInfo.nToolIndex
-         Strategy.Machinings[i].nType = MCH_MY.MILLING
-         Strategy.Machinings[i].dStartSafetyLength = 0
-         Strategy.Machinings[i].Steps = {}
-         Strategy.Machinings[i].Steps = MachiningLib.GetMachiningSteps( false, tonumber( Strategy.Machinings[i].sDepth), TOOLS[Strategy.Machinings[i].nToolIndex].dStep)
-
-         -- LeadIn / LeadOut
-         Strategy.Machinings[i].LeadIn = {}
-         Strategy.Machinings[i].LeadOut = {}
-         Strategy.Machinings[i].LeadIn.nType = MCH_MILL_LI.TANGENT
-         Strategy.Machinings[i].LeadOut.nType = MCH_MILL_LI.TANGENT
-         Strategy.Machinings[i].LeadIn.dTangentDistance = TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
-         Strategy.Machinings[i].LeadIn.dPerpDistance = 0
-         Strategy.Machinings[i].LeadIn.dStartAddLength = 0
-         Strategy.Machinings[i].LeadOut.dTangentDistance = TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
-         Strategy.Machinings[i].LeadOut.dPerpDistance = 0
-         Strategy.Machinings[i].LeadOut.dEndAddLength = 0
-
-         local dLengthOnX = Proc.b3Box:getDimX()
-         Strategy.bCanMoveAfterSplit = MachiningLib.CanMoveAfterSplitcut( dLengthOnX, Part)
-         if Proc.AffectedFaces.bLeft and Strategy.bCanMoveAfterSplit then
-            Strategy.Machinings[i].sStage = 'AfterTail'
-         end
-
-         -- preparo attacco/uscita in caso di spezzatura arco
-         Strategy.Machinings[i].LeadInForSplit = BeamLib.TableCopyDeep( Strategy.Machinings[i].LeadIn)
-         Strategy.Machinings[i].LeadOutForSplit = BeamLib.TableCopyDeep( Strategy.Machinings[i].LeadOut)
-         Strategy.Machinings[i].LeadInForSplit.nType = MCH_MILL_LI.LINEAR
-         Strategy.Machinings[i].LeadOutForSplit.nType = MCH_MILL_LI.LINEAR
-         Strategy.Machinings[i].LeadInForSplit.dTangentDistance = 0
-         Strategy.Machinings[i].LeadInForSplit.dPerpDistance = TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
-         Strategy.Machinings[i].LeadOutForSplit.dTangentDistance = 0
-         Strategy.Machinings[i].LeadOutForSplit.dPerpDistance = TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
-
-         -- sistemo il lato e la direzione di lavoro
-         if i == 1 then
-            Strategy.Machinings[i].bInvert = EgtIf( TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].bIsCCW, false, true)
-            Strategy.Machinings[i].nWorkside = EgtIf( TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
-         else
-            Strategy.Machinings[i].bToolInvert = true
-            Strategy.Machinings[i].bInvert = EgtIf( TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].bIsCCW, true, false)
-            Strategy.Machinings[i].nWorkside = EgtIf( TOOLS[Strategy.Machinings[i].ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
-         end
-         Strategy.Machinings[i].ptEdge1 = EgtSP( Proc.idAddAuxGeom, GDB_ID.ROOT)
-         Strategy.Machinings[i].ptEdge2 = EgtEP( Proc.idAddAuxGeom, GDB_ID.ROOT)
-         Strategy.Machinings[i].dEdgeLength = EgtCurveLength( Proc.idAddAuxGeom)
-         Strategy.Machinings[i].vtEdgeDirection = EgtSV( Proc.idAddAuxGeom, GDB_ID.ROOT) + EgtMV( Proc.idAddAuxGeom, GDB_ID.ROOT) + EgtEV( Proc.idAddAuxGeom, GDB_ID.ROOT)
-         Strategy.Machinings[i].dLengthOnX = Proc.b3Box:getDimX()
-
-         local MachiningToSplit = {}
-         table.insert( MachiningToSplit, Strategy.Machinings[i])
-         local MachiningResult = MachiningLib.GetSplitMachinings( MachiningToSplit, FeatureSplittingPoints, Part)
          -- aggiunge lavorazione
-         for j = 1, #MachiningResult do
+         for j = 1, #Strategy.Machinings do
-            bAreAllMachiningsAdded = MachiningLib.AddMachinings( Proc, MachiningResult[j])
+            if Proc.AffectedFaces.bLeft then
+               Strategy.Machinings[j].sStage = 'AfterTail'
             end
+            bAreAllMachiningsAdded = MachiningLib.AddMachinings( Proc, Strategy.Machinings[j])
+         end
+      end
+   else
+      Strategy.Result = FeatureLib.GetStrategyResultNotApplicable()
    end
 
-   else
-      bAreAllMachiningsAdded = false
-   end
 
    return bAreAllMachiningsAdded, Strategy.Result
 end

Strategies/Standard/STR0010/STR0010.lua

@@ -253,6 +253,7 @@ function STR0010.Make( bAddMachining, Proc, Part, CustomParameters)
    ToolSearchParameters.vtToolDirection = BottomFace1.vtN
    ToolSearchParameters.bAllowTopHead = true
    ToolSearchParameters.bAllowBottomHead = true
+   ToolSearchParameters.sMillShape = 'STANDARD'
    local ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
    local nToolIndex = ToolInfo.nToolIndex
 
@@ -391,7 +392,12 @@ function STR0010.Make( bAddMachining, Proc, Part, CustomParameters)
    Strategy.Machinings = MachiningLib.GetSplitMachinings( Strategy.Machinings, FeatureSplittingPoints, Part)
    table.sort( Strategy.Machinings, SortMachiningsBySegment)
 
+   -- se non ci sono lati chiusi, la qualità è migliore
+   if Proc.Topology.sName == 'Bevel-1-Through' or Proc.Topology.sName == 'DoubleBevel-2-Through' or Proc.Topology.sName == 'Cut-1-Through' then
+      Strategy.Result.dQuality = FeatureLib.GetStrategyQuality( 'FINE')
+   else
       Strategy.Result.dQuality = FeatureLib.GetStrategyQuality( Strategy.Machinings)
+   end
    Strategy.Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Strategy.Machinings)
    Strategy.Result.dMRR = ( dFeatureVolume / Strategy.Result.dTimeToMachine) / pow( 10, 6)
    if Strategy.Result.dCompletionPercentage > 100 - 10 * GEO.EPS_SMALL then

Strategies/Standard/STR0013/STR0013.lua

@@ -74,7 +74,7 @@ local function GetDrillingWithMillStrategy( Proc, Part)
          HalfMilling2.ToolInfo = MachiningLib.FindMill( Proc, ToolSearchParameters)
 
          -- se entrambi gli utensili lavorano in modo completo fino alla metà del foro, li sostituisco a qeulli trovati in precedenza
-         if HalfMilling.ToolInfo.dResidualDepth < 0 and HalfMilling2.ToolInfo.dResidualDepth < 0 then
+         if HalfMilling.ToolInfo.dResidualDepth and HalfMilling2.ToolInfo.dResidualDepth and HalfMilling.ToolInfo.dResidualDepth < 0 and HalfMilling2.ToolInfo.dResidualDepth < 0 then
             if Milling.ToolInfo.nToolIndex ~= HalfMilling.ToolInfo.nToolIndex then
                Milling.ToolInfo.nToolIndex, Milling.ToolInfo.dResidualDepth = HalfMilling.ToolInfo.nToolIndex, HalfMilling.ToolInfo.dResidualDepth
             end

Strategies/Standard/STR0014/STR0014.lua

@@ -24,6 +24,8 @@ local function GetSCC( Machining)
 
    if TOOLS[Machining.nToolIndex].SetupInfo.bToolOnAggregate then
       nSCC = MCH_SCC.ADIR_NEAR
+   elseif TOOLS[Machining.nToolIndex].SetupInfo.nBlockedSCC then
+      nSCC = TOOLS[Machining.nToolIndex].SetupInfo.nBlockedSCC
    elseif Machining.vtToolDirection:getY() <= 0 then
       nSCC = MCH_SCC.ADIR_YM
    else
@@ -96,7 +98,7 @@ function STR0014.Make( bAddMachining, Proc, Part, CustomParameters)
          Strategy.Machining.nSCC = GetSCC( Strategy.Machining)
 
          Strategy.Machining.nType = MCH_MY.MILLING
-         Strategy.Machining.sDepth = EgtClamp( Strategy.Parameters.dMachiningDepth, -1, 5)
+         Strategy.Machining.sDepth = EgtClamp( Strategy.Parameters.dMachiningDepth, -1, TOOLS[Strategy.Machining.nToolIndex].dMaxMaterial)
          Strategy.Machining.nWorkside = MCH_MILL_WS.CENTER
 
          -- LeadIn / LeadOut
@@ -105,11 +107,23 @@ function STR0014.Make( bAddMachining, Proc, Part, CustomParameters)
          Strategy.Machining.LeadIn.nType = MCH_MILL_LI.NONE
          Strategy.Machining.LeadOut.nType = MCH_MILL_LI.NONE
          
+         -- se è una penna, si limita la lavorazione per evitare di partire fuori dal grezzo
+         if ToolSearchParameters.sMillShape == 'PEN' then
+             Strategy.Machining.LeadIn.dStartAddLength = -20
+             Strategy.Machining.LeadOut.dEndAddLength = -20
+         end
+
+         -- TODO gestire meglio
+         -- se utensile montato su aggregato flottante
+         if TOOLS[Strategy.Machining.nToolIndex].bToolOnFloatingTH then
+            Strategy.Machining.dMaxElev = Strategy.Parameters.dMachiningDepth
+            Strategy.Machining.dLongitudinalOffset = -5
+         end
          -- stessi parametri cambia solo al geometria
          for i = 1, #Proc.FeatureInfo.AdditionalGeometries do
             local AuxId = Proc.id + Proc.FeatureInfo.AdditionalGeometries[i]
             Strategy.AuxiliaryData.Clones[i+1] = {}
-            Strategy.AuxiliaryData.Clones[i+1].Geometry = EgtSetMachiningGeometry( {{ AuxId, -1}})
+            Strategy.AuxiliaryData.Clones[i+1].Geometry = {{ AuxId, -1}}
          end
 
          bAreAllMachiningsAdded = MachiningLib.AddMachinings( Proc, Strategy.Machining, Strategy.AuxiliaryData)

Strategies/Strategies.ini

@@ -8,7 +8,7 @@ STR0005 = 1, 2 o 3 facce. Lama con taglio singolo o cubetti. Se richiesto o nece
 STR0006 = Tenone. Lama + fresa
 STR0007 = Mortasa a coda di rondine e mortasa frontale a coda di rondine
 STR0008 = Svuotatura mortasa (raggiata)
-STR0009 = !!DEPRECATA!! Sostituita da STR0015. RIUTILIZZABILE!
+STR0009 = ScarfJoint
 STR0010 = Fresatura perpendicolare (tipo cut, longcut)
 STR0011 = Foratura
 STR0012 = RidgeLap

StrategyLibs/BLADETOWASTE.lua

@@ -260,7 +260,7 @@ local function GetBestBlade( Proc, Part, Face, OptionalParameters)
    local dShortPartLength = OptionalParameters.dShortPartLength or BeamData.LEN_SHORT_PART
    local EdgeToMachineTop = OptionalParameters.EdgeToMachineTop
    local EdgeToMachineBottom = OptionalParameters.EdgeToMachineBottom
-   local bIsDicing = OptionalParameters.bIsDicing
+   local idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation
    local bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength
    -- TODO qui sarebbe meglio avere dExtra come OptionalParameter???
@@ -289,7 +289,7 @@ local function GetBestBlade( Proc, Part, Face, OptionalParameters)
          FaceToMachine = Face,
          EdgeToMachine = EdgeToMachineTop,
          Part = Part,
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       })
@@ -304,7 +304,7 @@ local function GetBestBlade( Proc, Part, Face, OptionalParameters)
          FaceToMachine = Face,
          EdgeToMachine = EdgeToMachineBottom,
          Part = Part,
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       })
@@ -371,7 +371,7 @@ local function GetSingleCutStrategy( Proc, Part, OptionalParameters)
    local bReduceBladePath = OptionalParameters.bReduceBladePath or false
    local bAllowFastCuts = OptionalParameters.bAllowFastCuts or false
    local FaceToMachine = Proc.Faces[OptionalParameters.nFaceToMachineIndex or 1]
-   local bIsDicing = OptionalParameters.bIsDicing or false
+   local idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation or 'Tail'
    local bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength or false
    -- lati da lavorare in base al tipo di lama
@@ -390,7 +390,7 @@ local function GetSingleCutStrategy( Proc, Part, OptionalParameters)
       EdgeToMachineTop = EdgeToMachineList.Top,
       EdgeToMachineBottom = EdgeToMachineList.Bottom,
       nToolIndex = nToolIndex,
-      bIsDicing = bIsDicing,
+      idCheckCollisionTm = idCheckCollisionTm,
       sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
       bCannotSplitRestLength = bCannotSplitRestLength
    }
@@ -442,7 +442,7 @@ local function GetSingleCutStrategy( Proc, Part, OptionalParameters)
          FaceToMachine = FaceToMachine,
          EdgeToMachine = EdgeToMachineList.TopGuillotine,
          Part = Part,
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       })
@@ -475,7 +475,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
    OptionalParameters = OptionalParameters or {}
    local nToolIndex = OptionalParameters.nToolIndex
    local FaceToMachine = Proc.Faces[OptionalParameters.nFaceToMachineIndex or 1]
-   local bIsDicing = OptionalParameters.bIsDicing or false
+   local idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation or 'Tail'
    local bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength or false
 
@@ -499,7 +499,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
          FaceToMachine = FaceToMachine,
          EdgeToMachine = EdgeToMachine,
          Part = Part,
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       })
@@ -512,7 +512,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
          FaceToMachine = FaceToMachine,
          EdgeToMachine = BeamLib.FindEdgeBestOrientedAsDirection( FaceToMachine.Edges, -EdgeToMachine.vtN),
          Part = Part,
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       })
@@ -534,7 +534,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
             FaceToMachine = FaceToMachine,
             EdgeToMachine = BeamLib.FindEdgeBestOrientedAsDirection( FaceToMachine.Edges, -EdgeToMachine.vtN),
             Part = Part,
-            bIsDicing = bIsDicing,
+            idCheckCollisionTm = idCheckCollisionTm,
             sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
             bCannotSplitRestLength = bCannotSplitRestLength
          })
@@ -553,7 +553,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
             FaceToMachine = FaceToMachine,
             EdgeToMachine = EdgeToMachine,
             Part = Part,
-            bIsDicing = bIsDicing,
+            idCheckCollisionTm = idCheckCollisionTm,
             sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
             bCannotSplitRestLength = bCannotSplitRestLength
          })
@@ -589,7 +589,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
       FaceToMachine = FaceToMachine,
       EdgeToMachine = EdgeToMachine,
       Part = Part,
-      bIsDicing = bIsDicing,
+      idCheckCollisionTm = idCheckCollisionTm,
       sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
       bCannotSplitRestLength = bCannotSplitRestLength
    })
@@ -607,7 +607,7 @@ local function GetDualSideCutStrategy( Proc, Part, OptionalParameters)
          dDepthToMachine = dDepthToMachine
       }
       local BladeEngagementOptionalParameters = {
-         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
          bCannotSplitRestLength = bCannotSplitRestLength
       }
@@ -782,6 +782,52 @@ local function CutWholeWaste( Proc, Part, OptionalParameters)
 end
 
 
+local function UpdateDiceRaw( idRaw, idParallelTm, idPerpendicularTm, Part, MainFace, OtherFace)
+
+   -- frame solidale alla feature
+   local vtZ = MainFace.vtN
+   local vtX = OtherFace and OtherFace.vtN or nil
+   local frMainFace = Frame3d( MainFace.ptCenter, vtZ, vtX)
+
+   -- box del cubetto in riferimento feature
+   local b3Surf = EgtGetBBoxRef( idParallelTm, GDB_BB.STANDARD, frMainFace)
+   if idPerpendicularTm then
+      local b3SurfPerpendicular = EgtGetBBoxRef( idPerpendicularTm, GDB_BB.STANDARD, frMainFace)
+      b3Surf:Add( b3SurfPerpendicular)
+   else
+      -- se non arriva la superficie perpendicolare è un solo taglio parallelo: si estende il box in Z in modo da uscire dal pezzo
+      local ptDeltaZ = b3Surf:getMax() + vtZ * ( MainFace.dElevation + 5)
+      b3Surf:Add( ptDeltaZ)
+   end
+
+   -- estensione box per non avere problemi nella sottrazione booleana
+   if OtherFace and idPerpendicularTm then
+      local vtY = vtZ ^ vtX
+      local ptDeltaX = b3Surf:getMax() + vtX * 1
+      local ptDeltaZ = b3Surf:getMax() + vtZ * 1
+      local ptDeltaYplus = b3Surf:getMax() + vtY * 1
+      local ptDeltaYminus = b3Surf:getMin() - vtY * 1
+      b3Surf:Add( ptDeltaX)
+      b3Surf:Add( ptDeltaZ)
+      b3Surf:Add( ptDeltaYplus)
+      b3Surf:Add( ptDeltaYminus)
+   else
+      b3Surf:expand( 1)
+   end
+   
+   -- si porta il box in riferimento globale 
+   b3Surf:toGlob( frMainFace)
+
+   -- conversione box cubetto in superficie
+   local idSurfTmToSubtract = EgtSurfTmBBox( Part.idTempGroup, b3Surf, false, GDB_RT.GLOB)
+
+   -- sottrazione del cubetto dal grezzo
+   EgtSurfTmSubtract( idRaw, idSurfTmToSubtract)
+
+   return idRaw
+end
+
+
 local function CalculateDiceMachinings( vCuts, Parameters)
    local Machinings = {}
    local bMoveAfterSplit = false
@@ -789,28 +835,24 @@ local function CalculateDiceMachinings( vCuts, Parameters)
    local Proc = Parameters.Proc
    local Part = Parameters.Part
    local MainFace = Parameters.MainFace
+   local OtherFace = next( Parameters.OtherFace) and Parameters.OtherFace or nil
    local Tool = Parameters.Tool
    local sChosenBladeType = Parameters.sChosenBladeType
    local dExtendAfterTail = Parameters.dExtendAfterTail
    local bReduceBladePath = Parameters.bReduceBladePath
    local sRestLengthSideForPreSimulation = Parameters.sRestLengthSideForPreSimulation
    local bCannotSplitRestLength = Parameters.bCannotSplitRestLength
+   local bReduceDiceDepth = Parameters.bReduceDiceDepth
+
+   -- trimesh con RestLength
+   local b3CheckCollision = BeamLib.GetPartBoxWithHeadTail( Part, sRestLengthSideForPreSimulation)
+   local idCheckCollisionTm = EgtSurfTmBBox( Part.idTempGroup, b3CheckCollision, false, GDB_RT.GLOB)
 
    -- eventuale inversione tagli ortogonali e aggiunta informazioni alla geometria
    local bAreOrthogonalCutsInverted = false
    for i = 1, #vCuts do
       for j = 1, #vCuts[i] do
          SetDiceFaceInfo( Proc, vCuts[i][j])
-         -- TODO vedere se questa parte serve ancora; in teoria no perchè il taglio è girato automaticamente nella FaceByBlade
-         -- if ( i % 2) == 1 then
-         --    local vtO = EgtSurfTmFacetNormVersor( vCuts[i][j], 0, GDB_ID.ROOT)
-         --    if MachiningLib.IsFaceZOutOfRange( vtO, Tool) then
-         --       EgtInvertSurf( vCuts[i][j])
-         --       local vtCurrentFaceNormal = EgtSurfTmFacetNormVersor( vCuts[i][j], 0, GDB_ID.ROOT)
-         --       EgtMove( vCuts[i][j], -vtCurrentFaceNormal * Tool.dThickness, GDB_RT.GLOB)
-         --       bAreOrthogonalCutsInverted = true
-         --    end
-         -- end
       end
    end
    -- calcolo lavorazioni
@@ -851,19 +893,17 @@ local function CalculateDiceMachinings( vCuts, Parameters)
       end
       -- calcolo lavorazione della singola faccia
       -- per tagli paralleli e faccia aperta si prova a tagliare come se fosse una faccia singola, accorpando i tagli
-      -- TODO bIsDicing è da mettere a true?
       local bCanMergeParallelCuts = ( ( i % 2) == 0) and ( Proc.nFct == 1)
       local bIsDicingOk = true
       if bCanMergeParallelCuts then
          local nAddGrpId = BeamLib.GetAddGroup( Part.id)
-         local nSurfToCut = EgtSurfTmBySewing( nAddGrpId, vCuts[i], false)
+         local idSurfToCut = EgtSurfTmBySewing( nAddGrpId, vCuts[i], false)
-         local ProcTrimesh = FeatureLib.GetProcFromTrimesh( nSurfToCut, Part)
+         local ProcTrimesh = FeatureLib.GetProcFromTrimesh( idSurfToCut, Part)
 
          local OptionalParametersCutWholeWaste = {
             nToolIndex = Tool.nIndex,
             dExtendAfterTail = dExtendAfterTail,
             bReduceBladePath = bReduceBladePath,
-            bIsDicing = false,
             sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
             bCannotSplitRestLength = bCannotSplitRestLength
          }
@@ -876,16 +916,25 @@ local function CalculateDiceMachinings( vCuts, Parameters)
                   bMoveAfterSplit = true
                end
             end
+            -- aggiornamento grezzo dinamico
+            if i % 2 == 0 then
+               UpdateDiceRaw( idCheckCollisionTm, idSurfToCut, vCuts[i-1][#vCuts[i-1]], Part, MainFace, OtherFace)
+            end
          else
-            EgtErase( nSurfToCut)
+            EgtErase( idSurfToCut)
             bIsDicingOk = false
          end
       end
       -- caso standard (tagli perpendicolari o paralleli non accorpabili)
       if ( not bCanMergeParallelCuts) or ( not bIsDicingOk) then
          for j = 1, #vCuts[i] do
-            -- in generale sta sollevato di pochissimo
+            -- se abilitato, la lama sta sollevata per non rovinare le facce
-            local dExtraCut = -0.1
+            local dExtraCut
+            if bReduceDiceDepth == false then
+               dExtraCut = 0
+            else
+               dExtraCut = -0.1
+            end
             -- se tagli paralleli
             if ( i % 2) == 0 then
                -- se non ci sono tagli ortogonali devo affondare
@@ -913,8 +962,10 @@ local function CalculateDiceMachinings( vCuts, Parameters)
                dRadialStepSpan = 0,
                dExtendAfterTail = dExtendAfterTail,
                bIsDicing = true,
+               idCheckCollisionTm = idCheckCollisionTm,
                sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-               bCannotSplitRestLength = bCannotSplitRestLength
+               bCannotSplitRestLength = bCannotSplitRestLength,
+               bDisableRealElevationCheck = true
             }
             Cutting = FaceByBlade.Make( ProcTrimesh, Part, FaceToMachine, EdgeToMachine, OptionalParametersFaceByBlade)
             Cutting.ptCenter = Point3d( ProcTrimesh.Faces[1].ptCenter:getX(), 0, 0)
@@ -929,6 +980,10 @@ local function CalculateDiceMachinings( vCuts, Parameters)
             if Cutting.sStage == 'AfterTail' then
                bMoveAfterSplit = true
             end
+            -- aggiornamento grezzo dinamico
+            if i % 2 == 0 then
+               UpdateDiceRaw( idCheckCollisionTm, vCuts[i][j], vCuts[i-1][j], Part, MainFace, OtherFace)
+            end
          end
       end
    end
@@ -964,6 +1019,9 @@ local function CutWithDicing( Proc, Part, OptionalParameters)
       end
    end
 
+   -- angolo tra le facce, se più di una
+   local dAngleBetweenFaces = Proc.AdjacencyMatrix[1][2] or 0
+
    -- scelta lama da sopra o da sotto
    local sChosenBladeType = ''
    if not nToolIndex then
@@ -1003,12 +1061,14 @@ local function CutWithDicing( Proc, Part, OptionalParameters)
       Proc = Proc,
       Part = Part,
       MainFace = Face1,
+      OtherFace = Face2,
       Tool = TOOLS[nToolIndex],
       sChosenBladeType = sChosenBladeType,
       dExtendAfterTail = dExtendAfterTail,
       bReduceBladePath = bReduceBladePath,
       sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-      bCannotSplitRestLength = bCannotSplitRestLength
+      bCannotSplitRestLength = bCannotSplitRestLength,
+      bReduceDiceDepth = ( dAngleBetweenFaces < - 10) -- per facce molto aperte non si riduce l'affondamento della lama nei cubetti (rischio che non si stacchino)
    }
 
    bIsDicingOk, Machinings, bMoveAfterSplit = CalculateDiceMachinings( vCuts, Parameters)

StrategyLibs/FACEBYBLADE.lua

@@ -209,8 +209,10 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
    local dRadialStepSpan = OptionalParameters.dRadialStepSpan
    local sUserNotes = OptionalParameters.sUserNotes or ''
    local bIsDicing = OptionalParameters.bIsDicing or false
+   local idCheckCollisionTm = OptionalParameters.idCheckCollisionTm
    local sRestLengthSideForPreSimulation = OptionalParameters.sRestLengthSideForPreSimulation or 'Tail'
    local bCannotSplitRestLength = OptionalParameters.bCannotSplitRestLength or false
+   local bDisableRealElevationCheck = OptionalParameters.bDisableRealElevationCheck or false
 
    -- lunghezze, direzioni e punti caratteristici della lavorazione e del lato lavorato
    Cutting.dEdgeLength = EdgeToMachine.dLength
@@ -231,10 +233,15 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
          Tool = TOOLS[Cutting.nToolIndex],
          dDepthToMachine = dDepthToMachine
       }
+      if OppositeToolDirectionMode == 'Enabled' then
+         BladeEngagementParameters.Edge = EdgeToMachineOpposite
+      end
       local BladeEngagementOptionalParameters = {
          bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-         bCannotSplitRestLength = bCannotSplitRestLength
+         bCannotSplitRestLength = bCannotSplitRestLength,
+         bDisableRealElevationCheck = bDisableRealElevationCheck
       }
       local Engagement
       TIMER:startElapsed( 'GetBladeEngagement')
@@ -258,6 +265,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
       ToolSearchParameters.Part = Part
       ToolSearchParameters.sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation
       ToolSearchParameters.bCannotSplitRestLength = bCannotSplitRestLength
+      ToolSearchParameters.bDisableRealElevationCheck = bDisableRealElevationCheck
 
       local ToolInfo = MachiningLib.FindBlade( Proc, ToolSearchParameters)
       Cutting.nToolIndex = ToolInfo.nToolIndex
@@ -354,8 +362,10 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
       }
       local BladeEngagementOptionalParameters = {
          bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
          sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-         bCannotSplitRestLength = bCannotSplitRestLength
+         bCannotSplitRestLength = bCannotSplitRestLength,
+         bDisableRealElevationCheck = bDisableRealElevationCheck
       }
       TIMER:startElapsed( 'GetBladeEngagement')
       local bIsApplicableOpposite, EngagementOpposite = MachiningLib.GetBladeEngagement( BladeEngagementParameters, BladeEngagementOptionalParameters)
@@ -471,8 +481,10 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
          }
          local BladeEngagementOptionalParameters = {
             bIsDicing = bIsDicing,
+            idCheckCollisionTm = idCheckCollisionTm,
             sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
-            bCannotSplitRestLength = bCannotSplitRestLength
+            bCannotSplitRestLength = bCannotSplitRestLength,
+            bDisableRealElevationCheck = bDisableRealElevationCheck
          }
          TIMER:startElapsed( 'GetBladeEngagement')
          local bIsApplicable, CurrentEngagement = MachiningLib.GetBladeEngagement( BladeEngagementParameters, BladeEngagementOptionalParameters )

UpdateLog.txt

@@ -1,4 +1,4 @@
            ==== Beam Update Log ====
 
-Versione 2.6-- (--/--/2024)
+Versione 3.1e1 (29/05/2026)
-- Primo commit creazione nuovo automatismo BEAM con strategie
+- Primo commit nuovo automatismo a strategie

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '2.8a1'
+VERSION = '3.1e1'
-MIN_EXE = '2.7j2'
+MIN_EXE = '3.1e1'