diff --git a/LuaLibs/BasicCustomerStrategies.lua b/LuaLibs/BasicCustomerStrategies.lua index fde7b67..e976d26 100644 --- a/LuaLibs/BasicCustomerStrategies.lua +++ b/LuaLibs/BasicCustomerStrategies.lua @@ -65,7 +65,7 @@ local function GetStrategies_Egalware( Proc) --------------------------------------------------------------------- -- Feature : Ridge or Valley Cut (0-12) elseif ID.IsDoubleLongitudinalCut( Proc) then - Strategies = { { sStrategyId = 'STR0010'}} + Strategies = { { sStrategyId = 'STR0005'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Saw Cut (0-13) elseif ID.IsSawCut( Proc) then @@ -389,7 +389,7 @@ local function GetStrategies_Essetre( Proc) --------------------------------------------------------------------- -- Feature : Ridge or Valley Cut (0-12) elseif ID.IsDoubleLongitudinalCut( Proc) then - Strategies = { { sStrategyId = 'STR0010'}} + Strategies = { { sStrategyId = 'STR0005'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Saw Cut (0-13) elseif ID.IsSawCut( Proc) then diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua index cc8b00c..de23e49 100644 --- a/LuaLibs/BeamExec.lua +++ b/LuaLibs/BeamExec.lua @@ -135,6 +135,7 @@ function BeamExec.GetToolsFromDB() if not Tool.SetupInfo.dMaxMatDecrease then Tool.SetupInfo.dMaxMatDecrease = 0 end + -- TODO sostituire la qualità numerica con una stringa?? Tool.nQuality = 1 Tool.sUUID = EgtTdbGetCurrToolParam( MCH_TP.UUID) Tool.sUserNotes = EgtTdbGetCurrToolParam( MCH_TP.USERNOTES) diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua index 7911981..89953ed 100644 --- a/LuaLibs/MachiningLib.lua +++ b/LuaLibs/MachiningLib.lua @@ -751,7 +751,7 @@ function MachiningLib.AddOperations( vProc, Part, sRotation) { sName = 'nOpenOutRaw', sMchParam = 'OpenOutRaw'}, { sName = 'nPlunge', sMchParam = 'Plunge'}, { sName = 'vtFaceUse', sMchParam = 'VtFaceUse'}, - { sName = 'nEdgeFaceUse', sMchParam = 'EdgeFaceUse'} + { sName = 'nEdgesFaceUse', sMchParam = 'EdgesFaceUse'} } -- parametri da scrivere nelle note di sistema diff --git a/StrategyLibs/BLADETOWASTE.lua b/StrategyLibs/BLADETOWASTE.lua index ba9ace0..57a0bee 100644 --- a/StrategyLibs/BLADETOWASTE.lua +++ b/StrategyLibs/BLADETOWASTE.lua @@ -441,7 +441,6 @@ local function CutWithDicing( Proc, Part, OptionalParameters) -- calcolo lavorazione della singola faccia for j = 1, #vCuts[i] do local Cutting = {} - local _, Edges = FaceData.GetEdgesInfo( vCuts[i][1], 0) local vtNCurrentFace = EgtSurfTmFacetNormVersor( vCuts[i][j], 0, GDB_ID.ROOT) local FaceToMachine = { id = 0, vtN = vtNCurrentFace} -- se taglio DownUp e strato pari composto da 1 o 2 elementi (tutti gli altri casi vengono saltati) @@ -453,6 +452,7 @@ local function CutWithDicing( Proc, Part, OptionalParameters) end -- lavorazione local ProcTrimesh = FeatureLib.GetProcFromTrimesh( vCuts[i][j], Part) + 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, @@ -488,6 +488,7 @@ local function CutWithDicing( Proc, Part, OptionalParameters) end end 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 diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua index a1f0b23..b44a0c2 100644 --- a/StrategyLibs/FACEBYBLADE.lua +++ b/StrategyLibs/FACEBYBLADE.lua @@ -174,7 +174,6 @@ local function GetSCC( vtMachiningDirection, vtEdgeDirection, vtNFace) end --- TODO calcolo area lavorata per completamento -- TODO EdgeToMachineAlternative da gestire -- TODO invert avanzato (direzione, Z, alternativa, ...) da gestire -- TODO bilinea da gestire @@ -350,13 +349,15 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar Cutting.dStartSafetyLength = BeamData.CUT_SIC -- overlap Cutting.dOverlap = 0 - -- faceuse e frame lavorazione + -- EdgeUse e frame lavorazione if bOppositeToolDirection then Cutting.nFaceuse = BeamLib.GetNearestOrthoOpposite( -Cutting.vtToolDirection) - Cutting.vtFaceUse = -Cutting.vtToolDirection + --Cutting.vtFaceUse = -Cutting.vtToolDirection + Cutting.nEdgesFaceUse = EdgeToMachine.id else Cutting.nFaceuse = BeamLib.GetNearestOrthoOpposite( Cutting.vtToolDirection) - Cutting.vtFaceUse = Cutting.vtToolDirection + --Cutting.vtFaceUse = Cutting.vtToolDirection + Cutting.nEdgesFaceUse = EdgeToMachine.id end -- SCC Cutting.nSCC = GetSCC( Cutting.vtToolDirection, Cutting.vtEdgeDirection, FaceToMachine.vtN) diff --git a/StrategyLibs/FACEBYMILL.lua b/StrategyLibs/FACEBYMILL.lua index 81540aa..bcdbb99 100644 --- a/StrategyLibs/FACEBYMILL.lua +++ b/StrategyLibs/FACEBYMILL.lua @@ -352,10 +352,12 @@ function FACEBYMILL.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPara -- faceuse e frame lavorazione if bOppositeToolDirection then Milling.nFaceuse = BeamLib.GetNearestOrthoOpposite( -Milling.vtToolDirection) - Milling.vtFaceUse = -Milling.vtToolDirection + --Milling.vtFaceUse = -Milling.vtToolDirection + Milling.nEdgesFaceUse = EdgeToMachine.id else Milling.nFaceuse = BeamLib.GetNearestOrthoOpposite( Milling.vtToolDirection) - Milling.vtFaceUse = Milling.vtToolDirection + --Milling.vtFaceUse = Milling.vtToolDirection + Milling.nEdgesFaceUse = EdgeToMachine.id end -- SCC Milling.nSCC = GetSCC( Milling.vtToolDirection)