Egalware/databeamnew
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/DoubleCut

Browse Source
This commit is contained in:
luca.mazzoleni
2025-04-30 23:56:03 +02:00
parent 85734fb7a3 8be4a152b7
commit e1bc32c22f
2 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
StrategyLibs/SPLITCUT.lua
+23 -14
View File
@@ -201,10 +201,13 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
local OptionalParameters = {}
OptionalParameters.nToolIndex = Strategy.SplitStrategy[1].ToolInfo.nToolIndex
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
Machining.AuxiliaryData.bIsSplitOrCut = true
end
OptionalParameters.dRadialStepSpan = 0
Machining.AuxiliaryData.bIsSplitOrCut = true
local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Y_AX())
Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
@@ -220,7 +223,9 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
-- Taglio lato frontale
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
OptionalParameters.dDepthToMachine = Part.dWidth / 2 + BeamData.CUT_EXTRA_MIN
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Presplit;', 'Precut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Presplit;', 'Precut;')
end
OptionalParameters.dRadialStepSpan = 0
local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Y_AX())
@@ -235,11 +240,12 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
OptionalParameters.nToolIndex = Strategy.SplitStrategy[1].ToolInfo.nToolIndex
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
OptionalParameters.dDepthToMachine = Part.dWidth / 2 + BeamData.CUT_EXTRA_MIN
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
Machining.AuxiliaryData.bIsSplitOrCut = true
end
OptionalParameters.dRadialStepSpan = 0
Machining.AuxiliaryData.bIsSplitOrCut = true
EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Y_AX())
Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
table.insert( Machinings, Machining)
@@ -252,11 +258,12 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
OptionalParameters.nToolIndex = Strategy.SplitStrategy[1].ToolInfo.nToolIndex
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
OptionalParameters.dDepthToMachine = Part.dHeight + BeamData.CUT_EXTRA
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
Machining.AuxiliaryData.bIsSplitOrCut = true
end
OptionalParameters.dRadialStepSpan = 0
Machining.AuxiliaryData.bIsSplitOrCut = true
local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Z_AX())
Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
table.insert( Machinings, Machining)
@@ -271,10 +278,11 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
local dExtraMaxMat = ( Strategy.SplitStrategy[1].ToolInfo.dMaxMatBladeFromTop + Strategy.SplitStrategy[2].ToolInfo.dMaxMatBladeFromDown - Part.dHeight - BeamData.CUT_EXTRA_MIN) / 2
OptionalParameters.dDepthToMachine = Strategy.SplitStrategy[1].ToolInfo.dMaxMatBladeFromTop - dExtraMaxMat
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Presplit;', 'Precut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Presplit;', 'Precut;')
end
OptionalParameters.dRadialStepSpan = 0
local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Z_AX())
Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
table.insert( Machinings, Machining)
@@ -287,11 +295,12 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
OptionalParameters.nToolIndex = Strategy.SplitStrategy[2].ToolInfo.nToolIndex
OptionalParameters.dLongitudinalOffset = Strategy.dOffset or 0
OptionalParameters.dDepthToMachine = Strategy.SplitStrategy[2].ToolInfo.dMaxMatBladeFromDown - dExtraMaxMat
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
if not Strategy.bIsPreCut then
OptionalParameters.sUserNotes = EgtIf( Strategy.bSplit, 'Split;', 'Cut;')
Machining.AuxiliaryData.bIsSplitOrCut = true
end
OptionalParameters.dRadialStepSpan = 0
Machining.AuxiliaryData.bIsSplitOrCut = true
EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Z_AX())
Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
table.insert( Machinings, Machining)