From f7a07e0cc17460e4e75a6e3d7decd52e954aa0d8 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Fri, 18 Jul 2025 11:35:50 +0200 Subject: [PATCH] - in BLADETOWASTE -> CutWithDicing e altre rimossi i riferimenti a EdgeToMachineAlternative, non usato --- StrategyLibs/BLADETOWASTE.lua | 27 ++++++++++++--------------- StrategyLibs/FACEBYBLADE.lua | 1 - StrategyLibs/FACEBYMILL.lua | 1 - 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/StrategyLibs/BLADETOWASTE.lua b/StrategyLibs/BLADETOWASTE.lua index d63e5ab..430bd6a 100644 --- a/StrategyLibs/BLADETOWASTE.lua +++ b/StrategyLibs/BLADETOWASTE.lua @@ -769,11 +769,12 @@ local function CutWithDicing( Proc, Part, OptionalParameters) local _, Edges = FaceData.GetEdgesInfo( vCuts[i][j], 0) local EdgeToMachine = BeamLib.FindEdgeBestOrientedAsDirection( Edges, vtToolDirectionNew) local dDepthToMachine = EdgeToMachine.dElevation + BeamData.CUT_EXTRA - local OptionalParametersFaceByBlade = { dDepthToMachine = dDepthToMachine, - nToolIndex = nToolIndex, - dRadialStepSpan = 0, - dExtendAfterTail = dExtendAfterTail - } + local OptionalParametersFaceByBlade = { + dDepthToMachine = dDepthToMachine, + nToolIndex = nToolIndex, + dRadialStepSpan = 0, + dExtendAfterTail = dExtendAfterTail + } Cutting = FaceByBlade.Make( ProcTrimesh, Part, FaceToMachine, EdgeToMachine, OptionalParametersFaceByBlade) Cutting.ptCenter = Point3d( ProcTrimesh.Faces[1].ptCenter:getX(), 0, 0) if Cutting.bIsApplicable then @@ -807,17 +808,13 @@ local function CutWithDicing( Proc, Part, OptionalParameters) local ProcTrimesh = FeatureLib.GetProcFromTrimesh( vCuts[i][j], Part) local _, Edges = FaceData.GetEdgesInfo( vCuts[i][j], 0) local EdgeToMachine = BeamLib.FindEdgeBestOrientedAsDirection( Edges, vtToolDirection) - local EdgeToMachineAlternative = {} - if ( i % 2 == 0) and ( Proc.Fct == 1) and bNoPerpCuts then - EdgeToMachineAlternative = BeamLib.FindEdgeBestOrientedAsDirection( Edges, -EdgeToMachine.vtN) - end local dDepthToMachine = EdgeToMachine.dElevation + dExtraCut - local OptionalParametersFaceByBlade = { dDepthToMachine = dDepthToMachine, - nToolIndex = nToolIndex, - EdgeToMachineAlternative = EdgeToMachineAlternative, - dRadialStepSpan = 0, - dExtendAfterTail = dExtendAfterTail - } + local OptionalParametersFaceByBlade = { + dDepthToMachine = dDepthToMachine, + nToolIndex = nToolIndex, + dRadialStepSpan = 0, + dExtendAfterTail = dExtendAfterTail + } Cutting = FaceByBlade.Make( ProcTrimesh, Part, FaceToMachine, EdgeToMachine, OptionalParametersFaceByBlade) Cutting.ptCenter = Point3d( ProcTrimesh.Faces[1].ptCenter:getX(), 0, 0) if Cutting.bIsApplicable then diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua index 14d08f2..5bf85b4 100644 --- a/StrategyLibs/FACEBYBLADE.lua +++ b/StrategyLibs/FACEBYBLADE.lua @@ -229,7 +229,6 @@ function FACEBYBLADE.GetRadialOffsetForGuillotine( nToolIndex, dEdgeLength, Opti end --- TODO EdgeToMachineAlternative da gestire? function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalParameters) local Cutting = MachiningLib.InitMachiningParameters( MCH_MY.MILLING) Cutting.bIsApplicable = true diff --git a/StrategyLibs/FACEBYMILL.lua b/StrategyLibs/FACEBYMILL.lua index d020e76..fd5ed3d 100644 --- a/StrategyLibs/FACEBYMILL.lua +++ b/StrategyLibs/FACEBYMILL.lua @@ -165,7 +165,6 @@ end -- TODO calcolo area lavorata per completamento --- TODO EdgeToMachineAlternative da gestire function FACEBYMILL.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalParameters) local Milling = MachiningLib.InitMachiningParameters( MCH_MY.MILLING) Milling.bIsApplicable = true