diff --git a/LuaLibs/BeamLib.lua b/LuaLibs/BeamLib.lua index 97c94d5..9238635 100644 --- a/LuaLibs/BeamLib.lua +++ b/LuaLibs/BeamLib.lua @@ -528,9 +528,9 @@ function BeamLib.GetPieceGeneralParameters( Part, DefaultGeneralParamList) GeneralParameters[DefaultGeneralParamList[i].sName] = xParameterValue end else - if GENERAL_PARAMETERS.BTL and GENERAL_PARAMETERS.BTL[Part.sBTLInfo] and GENERAL_PARAMETERS.BTL[Part.sBTLInfo][DefaultGeneralParamList[i].sName] then + if GENERAL_PARAMETERS.BTL and GENERAL_PARAMETERS.BTL[Part.sBTLInfo] and GENERAL_PARAMETERS.BTL[Part.sBTLInfo][DefaultGeneralParamList[i].sName] ~= nil then GeneralParameters[DefaultGeneralParamList[i].sName] = GENERAL_PARAMETERS.BTL[Part.sBTLInfo][DefaultGeneralParamList[i].sName] - elseif GENERAL_PARAMETERS.PROJECT[DefaultGeneralParamList[i].sName] then + elseif GENERAL_PARAMETERS.PROJECT[DefaultGeneralParamList[i].sName] ~= nil then GeneralParameters[DefaultGeneralParamList[i].sName] = GENERAL_PARAMETERS.PROJECT[DefaultGeneralParamList[i].sName] end end diff --git a/StrategyLibs/BLADETOWASTE.lua b/StrategyLibs/BLADETOWASTE.lua index 37332ed..73690a8 100644 --- a/StrategyLibs/BLADETOWASTE.lua +++ b/StrategyLibs/BLADETOWASTE.lua @@ -644,8 +644,7 @@ local function CutWholeWaste( Proc, Part, OptionalParameters) Cutting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParametersFaceByBlade) -- se taglio da un lato non ce la fa, si prova da due lati - -- TODO valutare se deve funzionare solo per i rettangoli - elseif FaceData.IsFaceParallelogram( Proc.Faces[1]) then + elseif FaceData.IsFaceRectangle( Proc.Faces[1]) then local CuttingParametersList CuttingParametersList, EdgeToMachine = GetDualSideCutStrategy( Proc, Part, OptionalParameters) @@ -742,6 +741,7 @@ local function CutWithDicing( Proc, Part, OptionalParameters) local dExtendAfterTail = OptionalParameters.dExtendAfterTail or 10000 local b3BoxDicing = OptionalParameters.b3BoxDicing local bSaveAddedGeometries = OptionalParameters.bSaveAddedGeometries + local bReduceBladePath = OptionalParameters.bReduceBladePath or false if bSaveAddedGeometries == nil then bSaveAddedGeometries = true end @@ -858,7 +858,8 @@ local function CutWithDicing( Proc, Part, OptionalParameters) -- TODO ridurre con bReduceBladePath anche questi tagli? local OptionalParametersCutWholeWaste = { nToolIndex = nToolIndex, - dExtendAfterTail = dExtendAfterTail + dExtendAfterTail = dExtendAfterTail, + bReduceBladePath = bReduceBladePath } local CutWholeWasteMachinings, CutWholeWasteResult = CutWholeWaste( ProcTrimesh, Part, OptionalParametersCutWholeWaste) diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua index 412d229..1d27f69 100644 --- a/StrategyLibs/FACEBYBLADE.lua +++ b/StrategyLibs/FACEBYBLADE.lua @@ -349,7 +349,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar end -- se OppositeToolDirectionMode è Optimized, se possibile e necessario, si attiva la lavorazione dal lato opposto per garantire taglio concorde e verso l'alto (massima qualità) - if ( OppositeToolDirectionMode == 'Optimized') and ( Proc.nFct == 1) and ( FaceData.IsFaceParallelogram( FaceToMachine)) then + if ( OppositeToolDirectionMode == 'Optimized') and ( Proc.nFct == 1) and ( FaceData.IsFaceRectangle( FaceToMachine)) then OppositeToolDirectionMode = 'Disabled'