Merge branch 'DicingPresimDynamicRaw' into develop

2026-06-11 17:40:53 +02:00
parent c506486585 b8d3cd461b
commit 2cee0831d0
4 changed files with 44 additions and 49 deletions
@@ -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
@@ -373,7 +373,7 @@ local function TestEngagement( sBladeEngagement, Parameters, OptionalParameters)
      CheckCollisionOptionalParameters.PointsToCheck = {}
      table.insert( CheckCollisionOptionalParameters.PointsToCheck, PerpendicularLeadInOut.LeadIn.ptPoint)
      table.insert( CheckCollisionOptionalParameters.PointsToCheck, PerpendicularLeadInOut.LeadOut.ptPoint)
-      local bCollisionFoundPerpendicular, bMoveAfterSplitPerpendicular = PreSimulationLib.CheckCollision( sBladeEngagement, CheckCollisionParameters, CheckCollisionOptionalParameters)
+      local bCollisionFoundPerpendicular, bMoveAfterSplitPerpendicular = PreSimulationLib.CheckCollision( CheckCollisionParameters, CheckCollisionOptionalParameters)
      -- attacco perpendicolare possibile
      if not bCollisionFoundPerpendicular then
         LeadInOut.Perpendicular = PerpendicularLeadInOut
@@ -403,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
@@ -628,7 +628,7 @@ 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
@@ -663,7 +663,7 @@ function MachiningLib.FindBlade( Proc, ToolSearchParameters)
               dDepthToMachine = min( dElevation, TOOLS[i].dMaxDepth)
            }
            local BladeEngagementOptionalParameters = {
-               bIsDicing = bIsDicing,
+               idCheckCollisionTm = idCheckCollisionTm,
               sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
               bCannotSplitRestLength = bCannotSplitRestLength,
               bDisableRealElevationCheck = bDisableRealElevationCheck
@@ -305,7 +305,7 @@ local function MoveMachineAxesToPosition( ptOnToolTipCenter, vtHead, vtAux)
 end

 -------------------------------------------------------------------------------------------------------------
-local function CheckCollisionPoint( sAxis, ptOnToolTipCenter, vtHead, vtAux, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, bCheckOnlyRestlength)
+local function CheckCollisionPoint( sAxis, ptOnToolTipCenter, vtHead, vtAux, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, idCheckCollisionTm)

   -- spostamento assi macchina in posizione
   local dDeltaXHeadOffset = MoveMachineAxesToPosition( ptOnToolTipCenter, vtHead, vtAux)
@@ -337,32 +337,32 @@ local function CheckCollisionPoint( sAxis, ptOnToolTipCenter, vtHead, vtAux, Par

   -- check collisione con pezzo
   local bCollisionFoundPiece = false
-   if not bCheckOnlyRestlength then
-      local idCheckCollisionTm = Part.idBoxTm
+   if not idCheckCollisionTm then
+      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
-      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( CollisionSurfTmId[i], RED())
-         end
-         if bCollisionFoundPiece then
-            break
-         end
+   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( 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
@@ -401,7 +401,7 @@ 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
@@ -426,7 +426,7 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
   -- 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, #PointsOnToolTipCenter do

-      local bCollisionFoundPiece, bCollisionFoundRestLength = CheckCollisionPoint( sAxis, PointsOnToolTipCenter[i], vtHead, vtAux, 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
@@ -445,7 +445,7 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
 end

 -------------------------------------------------------------------------------------------------------------
-function PreSimulationLib.CheckCollision( sBladeEngagement, Parameters, OptionalParameters)
+function PreSimulationLib.CheckCollision( Parameters, OptionalParameters)

   local bCollisionFound
   local bMoveAfterSplitL3, bMoveAfterSplitR3, bMoveAfterSplitR2, bMoveAfterSplitR1
@@ -459,24 +459,19 @@ function PreSimulationLib.CheckCollision( sBladeEngagement, Parameters, Optional
   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 sBlockedAxis = OptionalParameters.sBlockedAxis
-   local bIsDicing = OptionalParameters.bIsDicing or false
   local bDisableRealElevationCheck = OptionalParameters.bDisableRealElevationCheck or false
-   local bCheckOnlyRestlengthForAxisABC = 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
-   elseif not bDisableRealElevationCheck then
+   if not bDisableRealElevationCheck then
      local Edge = Parameters.Edge
      local vtNFace = Parameters.vtNFace
      local dDepthToMachine = Parameters.dDepthToMachine
@@ -523,9 +518,6 @@ function PreSimulationLib.CheckCollision( sBladeEngagement, Parameters, Optional
   -- ultimo asse lineare prima dei rotativi (solitamente Z) si controlla sempre
   bCollisionFound, bMoveAfterSplitL3 = CheckCollisionWithAxis( sL3, Parameters, OptionalParametersCheckCollisionWithAxis)

-   -- assi rotativi: se richiesto si controlla la collisione solo col grezzo
-   OptionalParametersCheckCollisionWithAxis.bCheckOnlyRestlength = bCheckOnlyRestlengthForAxisABC
-
   if sR3 and not bCollisionFound then
      bCollisionFound, bMoveAfterSplitR3 = CheckCollisionWithAxis( sR3, Parameters, OptionalParametersCheckCollisionWithAxis)
   end
@@ -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
      }
@@ -893,7 +893,6 @@ 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
@@ -905,7 +904,6 @@ local function CalculateDiceMachinings( vCuts, Parameters)
            nToolIndex = Tool.nIndex,
            dExtendAfterTail = dExtendAfterTail,
            bReduceBladePath = bReduceBladePath,
-            bIsDicing = false,
            sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
            bCannotSplitRestLength = bCannotSplitRestLength
         }
@@ -964,9 +962,10 @@ local function CalculateDiceMachinings( vCuts, Parameters)
               dRadialStepSpan = 0,
               dExtendAfterTail = dExtendAfterTail,
               bIsDicing = true,
+               idCheckCollisionTm = idCheckCollisionTm,
               sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
               bCannotSplitRestLength = bCannotSplitRestLength,
-               bDisableRealElevationCheck = ( i % 2) > 0 -- se taglio perpendicolare non si deve mai considerare il materiale precedente
+               bDisableRealElevationCheck = true
            }
            Cutting = FaceByBlade.Make( ProcTrimesh, Part, FaceToMachine, EdgeToMachine, OptionalParametersFaceByBlade)
            Cutting.ptCenter = Point3d( ProcTrimesh.Faces[1].ptCenter:getX(), 0, 0)
@@ -209,6 +209,7 @@ 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
@@ -237,6 +238,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
      end
      local BladeEngagementOptionalParameters = {
         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
         sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
         bCannotSplitRestLength = bCannotSplitRestLength,
         bDisableRealElevationCheck = bDisableRealElevationCheck
@@ -360,6 +362,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
      }
      local BladeEngagementOptionalParameters = {
         bIsDicing = bIsDicing,
+         idCheckCollisionTm = idCheckCollisionTm,
         sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
         bCannotSplitRestLength = bCannotSplitRestLength,
         bDisableRealElevationCheck = bDisableRealElevationCheck
@@ -478,6 +481,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
         }
         local BladeEngagementOptionalParameters = {
            bIsDicing = bIsDicing,
+            idCheckCollisionTm = idCheckCollisionTm,
            sRestLengthSideForPreSimulation = sRestLengthSideForPreSimulation,
            bCannotSplitRestLength = bCannotSplitRestLength,
            bDisableRealElevationCheck = bDisableRealElevationCheck