diff --git a/LuaLibs/BasicCustomerStrategies.lua b/LuaLibs/BasicCustomerStrategies.lua index 1e2715f..3c87680 100644 --- a/LuaLibs/BasicCustomerStrategies.lua +++ b/LuaLibs/BasicCustomerStrategies.lua @@ -297,9 +297,11 @@ local function GetStrategies_Egalware( Proc) --------------------------------------------------------------------- -- Feature : Step Joint (1-80) elseif ID.IsStepJoint( Proc) then + Strategies = { { sStrategyId = 'STR0002'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Step Joint Notch (0-80) elseif ID.IsStepJointNotch( Proc) then + Strategies = { { sStrategyId = 'STR0002'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Planing (0-90) elseif ID.IsPlaning( Proc) then @@ -619,9 +621,11 @@ local function GetStrategies_Essetre( Proc) --------------------------------------------------------------------- -- Feature : Step Joint (1-80) elseif ID.IsStepJoint( Proc) then + Strategies = { { sStrategyId = 'STR0002'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Step Joint Notch (0-80) elseif ID.IsStepJointNotch( Proc) then + Strategies = { { sStrategyId = 'STR0002'}, { sStrategyId = 'STR0010'}} --------------------------------------------------------------------- -- Feature : Planing (0-90) elseif ID.IsPlaning( Proc) then diff --git a/LuaLibs/FeatureLib.lua b/LuaLibs/FeatureLib.lua index 7b52868..30a37a3 100644 --- a/LuaLibs/FeatureLib.lua +++ b/LuaLibs/FeatureLib.lua @@ -40,47 +40,51 @@ end -- recupero topologia della feature function FeatureLib.NeedTopologyFeature( Proc) -- features tipo taglio - if ID.IsCut( Proc) then + if ID.IsCut( Proc) then -- (1-10) return true - elseif ID.IsHeadCut( Proc) then + elseif ID.IsHeadCut( Proc) then -- (1-340) return true - elseif ID.IsTailCut( Proc) then + elseif ID.IsTailCut( Proc) then -- (2-350) return true - elseif ID.IsDoubleCut( Proc) then + elseif ID.IsDoubleCut( Proc) then -- (1-11) return true - elseif ID.IsSawCut( Proc) then + elseif ID.IsSawCut( Proc) then -- (0-13) return true -- features tipo taglio longitudinale - elseif ID.IsLongitudinalCut( Proc) then + elseif ID.IsLongitudinalCut( Proc) then -- (0-10) return true - elseif ID.IsDoubleLongitudinalCut( Proc) then + elseif ID.IsDoubleLongitudinalCut( Proc) then -- (0-12) return true - elseif ID.IsChamfer( Proc) then + elseif ID.IsChamfer( Proc) then -- (0-36) return true -- features tipo LapJoint - elseif ID.IsSlot( Proc) then + elseif ID.IsSlot( Proc) then -- (1-16) return true - elseif ID.IsFrontSlot( Proc) then + elseif ID.IsFrontSlot( Proc) then -- (1-17) return true - elseif ID.IsBirdsMouth( Proc) then + elseif ID.IsBirdsMouth( Proc) then -- (1-20) return true - elseif ID.IsLapJoint( Proc) then + elseif ID.IsLapJoint( Proc) then -- (0-30) return true - elseif ID.IsNotchRabbet( Proc) then + elseif ID.IsNotchRabbet( Proc) then -- (1-32) return true - elseif ID.IsNotch( Proc) then + elseif ID.IsNotch( Proc) then -- (1-34) return true - elseif ID.IsPocket( Proc) then + elseif ID.IsPocket( Proc) then -- (1-39) return true -- calcolo topologia da geometria SOLO se non raggiata - elseif ID.IsMortise( Proc) and Proc.nFct < 6 then + elseif ID.IsMortise( Proc) and Proc.nFct < 6 then -- (1-50) return true -- calcolo topologia da geometria SOLO se non raggiata - elseif ID.IsFrontMortise( Proc) and Proc.nFct < 6 then + elseif ID.IsFrontMortise( Proc) and Proc.nFct < 6 then -- (1-51) return true - elseif ID.IsBlockHaus( Proc) then + elseif ID.IsBlockHaus( Proc) then -- (1-33) return true - elseif ID.IsRidgeLap( Proc) and Proc.nFct ~= 3 then + elseif ID.IsRidgeLap( Proc) and Proc.nFct ~= 3 then -- (1-30) + return true + elseif ID.IsStepJoint( Proc) then -- (1-80) + return true + elseif ID.IsStepJointNotch( Proc) then -- (0-80) return true end diff --git a/Strategies/AvailableStrategyList.json b/Strategies/AvailableStrategyList.json index 1a6f734..ab20c26 100644 --- a/Strategies/AvailableStrategyList.json +++ b/Strategies/AvailableStrategyList.json @@ -500,7 +500,7 @@ "nGrp": "1", "TopologyList" : [ { "sName": "Feature", - "StrategyList" : [ ] + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -510,7 +510,7 @@ "nGrp": "0", "TopologyList" : [ { "sName": "Feature", - "StrategyList" : [ ] + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] },