From 0d3cc467a97a3774fbed9d1a18fece5646556418 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Thu, 24 Apr 2025 08:49:16 +0200 Subject: [PATCH] - I file della strategia si chiamano tutti allo stesso modo secondo standard STRxxxx, cambia estensione. LUA = Script, JSON=Parametri di default configurabili - Aggiunto file AvailableStrategyList.json che sostituisce il file Strategies.INI --- LuaLibs/BeamExec.lua | 2 +- Strategies/AvailableStrategyList.json | 628 ++++++++++++++++++ .../{HEADCUTConfig.json => HEADCUT.json} | 0 .../{STR0001Config.json => STR0001.json} | 0 .../{STR0002Config.json => STR0002.json} | 0 .../{STR0003Config.json => STR0003.json} | 0 .../{STR0004Config.json => STR0004.json} | 0 .../{STR0005Config.json => STR0005.json} | 0 .../{STR0006Config.json => STR0006.json} | 0 .../{STR0007Config.json => STR0007.json} | 0 .../{STR0008Config.json => STR0008.json} | 0 .../{STR0009Config.json => STR0009.json} | 0 .../{TAILCUTConfig.json => TAILCUT.json} | 0 13 files changed, 629 insertions(+), 1 deletion(-) create mode 100644 Strategies/AvailableStrategyList.json rename Strategies/Standard/HEADCUT/{HEADCUTConfig.json => HEADCUT.json} (100%) rename Strategies/Standard/STR0001/{STR0001Config.json => STR0001.json} (100%) rename Strategies/Standard/STR0002/{STR0002Config.json => STR0002.json} (100%) rename Strategies/Standard/STR0003/{STR0003Config.json => STR0003.json} (100%) rename Strategies/Standard/STR0004/{STR0004Config.json => STR0004.json} (100%) rename Strategies/Standard/STR0005/{STR0005Config.json => STR0005.json} (100%) rename Strategies/Standard/STR0006/{STR0006Config.json => STR0006.json} (100%) rename Strategies/Standard/STR0007/{STR0007Config.json => STR0007.json} (100%) rename Strategies/Standard/STR0008/{STR0008Config.json => STR0008.json} (100%) rename Strategies/Standard/STR0009/{STR0009Config.json => STR0009.json} (100%) rename Strategies/Standard/TAILCUT/{TAILCUTConfig.json => TAILCUT.json} (100%) diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua index f35a72a..aeea289 100644 --- a/LuaLibs/BeamExec.lua +++ b/LuaLibs/BeamExec.lua @@ -802,7 +802,7 @@ local function RunStrategyLibraries( sStrategyId) local StrategyScriptPathStandard = BEAM.BASEDIR .. '\\Strategies\\Standard\\' .. StrategyScriptName .. '.lua' local StrategyScriptPathSpecial = BEAM.BASEDIR .. '\\Strategies\\Special\\' .. StrategyScriptName .. '.lua' -- file config - local StrategyConfigName = sStrategyId .. '\\' .. sStrategyId .. 'Config.json' + local StrategyConfigName = sStrategyId .. '\\' .. sStrategyId .. '.json' local StrategyConfigPathStandard = BEAM.BASEDIR .. '\\Strategies\\Standard\\' .. StrategyConfigName local StrategyConfigPathSpecial = BEAM.BASEDIR .. '\\Strategies\\Special\\' .. StrategyConfigName diff --git a/Strategies/AvailableStrategyList.json b/Strategies/AvailableStrategyList.json new file mode 100644 index 0000000..03d96bc --- /dev/null +++ b/Strategies/AvailableStrategyList.json @@ -0,0 +1,628 @@ + +[ + { + "Name":"Cut", + "Prc": "10", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ { "StrategyID": "STR0005" } ] + } + ] + }, + { + "Name":"Longitudinal Cut", + "Prc": "10", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ { "StrategyID": "STR0005" } ] + } + ] + }, + { + "Name":"Double Cut", + "Prc": "11", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Ridge or Valley Cut", + "Prc": "12", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Saw Cut", + "Prc": "13", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Slot", + "Prc": "16", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Fron Slot", + "Prc": "17", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Birds Mouth", + "Prc": "20", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Hip or Valley Rafter Notch", + "Prc": "25", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Ridge Lap", + "Prc": "30", + "Grp": "1", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Lap Joint", + "Prc": "30", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Notch/Rabbet", + "Prc": "32", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Block Haus", + "Prc": "33", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Notch", + "Prc": "34", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"French Ridge Lap", + "Prc": "35", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Chamfer", + "Prc": "36", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Block Haus Half Lap", + "Prc": "37", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Block Haus Front", + "Prc": "38", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Pocket", + "Prc": "39", + "Grp": "0", + "TopologyList" : [ + { "Name": "Pocket-5-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-4-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Tunnel-4-Through", + "StrategyList" : [ { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Through", + "StrategyList" : [ { "StrategyID": "STR0002" }, { "StrategyID": "STR0003" }, { "StrategyID": "STR0004" } ] + }, + { "Name": "Groove-3-Blind", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + }, + { "Name": "Rabbet-2-Through", + "StrategyList" : [ { "StrategyID": "STR0002" } ] + } + ] + }, + { + "Name":"Drilling", + "Prc": "40", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Tenon", + "Prc": "50", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Mortise", + "Prc": "50", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Front Mortise", + "Prc": "51", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"House", + "Prc": "52", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"House Mortise", + "Prc": "53", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Dovetail Tenon", + "Prc": "55", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ { "StrategyID": "STR0001" } ] + } + ] + }, + { + "Name":"Dovetail Mortise", + "Prc": "55", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Dovetail Mortise Front", + "Prc": "56", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Marking", + "Prc": "60", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Text", + "Prc": "61", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Scarf Simple", + "Prc": "70", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Scarf Joint", + "Prc": "71", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Step Joint", + "Prc": "80", + "Grp": "1", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Step Joint Notch", + "Prc": "80", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Planing", + "Prc": "90", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Front Profile", + "Prc": "100", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Head Concave Profile", + "Prc": "101", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Head Convex Profile", + "Prc": "102", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Head Cambered Profile", + "Prc": "103", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Round Arch", + "Prc": "104", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Head Profile", + "Prc": "106", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Sphere", + "Prc": "107", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Triangle Cut", + "Prc": "120", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"TyroleanDovetail", + "Prc": "136", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Dovetail", + "Prc": "138", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Free Contour", + "Prc": "250", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Outline", + "Prc": "251", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Aperture", + "Prc": "252", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"HeadCut", + "Prc": "340", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"TailCut", + "Prc": "350", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Variant", + "Prc": "900", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + }, + { + "Name":"Decor", + "Prc": "959", + "Grp": "0", + "TopologyList" : [ + { "Name": "Feature", + "StrategyList" : [ ] + } + ] + } +] \ No newline at end of file diff --git a/Strategies/Standard/HEADCUT/HEADCUTConfig.json b/Strategies/Standard/HEADCUT/HEADCUT.json similarity index 100% rename from Strategies/Standard/HEADCUT/HEADCUTConfig.json rename to Strategies/Standard/HEADCUT/HEADCUT.json diff --git a/Strategies/Standard/STR0001/STR0001Config.json b/Strategies/Standard/STR0001/STR0001.json similarity index 100% rename from Strategies/Standard/STR0001/STR0001Config.json rename to Strategies/Standard/STR0001/STR0001.json diff --git a/Strategies/Standard/STR0002/STR0002Config.json b/Strategies/Standard/STR0002/STR0002.json similarity index 100% rename from Strategies/Standard/STR0002/STR0002Config.json rename to Strategies/Standard/STR0002/STR0002.json diff --git a/Strategies/Standard/STR0003/STR0003Config.json b/Strategies/Standard/STR0003/STR0003.json similarity index 100% rename from Strategies/Standard/STR0003/STR0003Config.json rename to Strategies/Standard/STR0003/STR0003.json diff --git a/Strategies/Standard/STR0004/STR0004Config.json b/Strategies/Standard/STR0004/STR0004.json similarity index 100% rename from Strategies/Standard/STR0004/STR0004Config.json rename to Strategies/Standard/STR0004/STR0004.json diff --git a/Strategies/Standard/STR0005/STR0005Config.json b/Strategies/Standard/STR0005/STR0005.json similarity index 100% rename from Strategies/Standard/STR0005/STR0005Config.json rename to Strategies/Standard/STR0005/STR0005.json diff --git a/Strategies/Standard/STR0006/STR0006Config.json b/Strategies/Standard/STR0006/STR0006.json similarity index 100% rename from Strategies/Standard/STR0006/STR0006Config.json rename to Strategies/Standard/STR0006/STR0006.json diff --git a/Strategies/Standard/STR0007/STR0007Config.json b/Strategies/Standard/STR0007/STR0007.json similarity index 100% rename from Strategies/Standard/STR0007/STR0007Config.json rename to Strategies/Standard/STR0007/STR0007.json diff --git a/Strategies/Standard/STR0008/STR0008Config.json b/Strategies/Standard/STR0008/STR0008.json similarity index 100% rename from Strategies/Standard/STR0008/STR0008Config.json rename to Strategies/Standard/STR0008/STR0008.json diff --git a/Strategies/Standard/STR0009/STR0009Config.json b/Strategies/Standard/STR0009/STR0009.json similarity index 100% rename from Strategies/Standard/STR0009/STR0009Config.json rename to Strategies/Standard/STR0009/STR0009.json diff --git a/Strategies/Standard/TAILCUT/TAILCUTConfig.json b/Strategies/Standard/TAILCUT/TAILCUT.json similarity index 100% rename from Strategies/Standard/TAILCUT/TAILCUTConfig.json rename to Strategies/Standard/TAILCUT/TAILCUT.json