diff --git a/BatchProcessNew.lua b/BatchProcessNew.lua index 09a263d..97ea391 100644 --- a/BatchProcessNew.lua +++ b/BatchProcessNew.lua @@ -3,7 +3,7 @@ -- Intestazioni require( 'EgtBase') _ENV = EgtProtectGlobal() -EgtEnableDebug( true) +EgtEnableDebug( false) -- Imposto direttorio libreria specializzata per Travi EgtAddToPackagePath( BEAM.BASEDIR .. '\\LuaLibs\\?.lua') diff --git a/LuaLibs/FeatureLib.lua b/LuaLibs/FeatureLib.lua index 719140b..6a87064 100644 --- a/LuaLibs/FeatureLib.lua +++ b/LuaLibs/FeatureLib.lua @@ -135,18 +135,16 @@ local function IsAnyDimensionLongAsPart( Proc, Part) end ------------------------------------------------------------------------------------------------------------- --- restituisce vero se la feature con box b3Proc taglia l'intera sezione della barra, rappresentata dalle sue dimensioni W e H +-- restituisce vero se la feature con box b3Proc taglia l'intera sezione della barra local function IsFeatureCuttingEntireSection( b3Proc, Part) - local b3RawOrPart = Part.b3Raw or Part.b3Part - return ( b3Proc:getDimY() > ( b3RawOrPart:getDimY() - 500 * GEO.EPS_SMALL) and b3Proc:getDimZ() > ( b3RawOrPart:getDimZ() - 500 * GEO.EPS_SMALL)) + return ( b3Proc:getDimY() > ( Part.b3Part:getDimY() - 500 * GEO.EPS_SMALL) and b3Proc:getDimZ() > ( Part.b3Part:getDimZ() - 500 * GEO.EPS_SMALL)) end ------------------------------------------------------------------------------------------------------------- --- restituisce vero se la feature con box b3Proc taglia l'intera lunghezza della barra, rappresentata dalle sue dimensioni W e L oppure H e L +-- restituisce vero se la feature con box b3Proc taglia l'intera lunghezza della barra local function IsFeatureCuttingEntireLength( b3Proc, Part) - local b3RawOrPart = Part.b3Raw or Part.b3Part - return ( ( b3Proc:getDimY() > ( b3RawOrPart:getDimY() - 500 * GEO.EPS_SMALL) and b3Proc:getDimX() > ( b3RawOrPart:getDimX() - 500 * GEO.EPS_SMALL)) or - ( b3Proc:getDimZ() > ( b3RawOrPart:getDimZ() - 500 * GEO.EPS_SMALL) and b3Proc:getDimX() > ( b3RawOrPart:getDimX() - 500 * GEO.EPS_SMALL))) + return ( ( b3Proc:getDimY() > ( Part.b3Part:getDimY() - 500 * GEO.EPS_SMALL) and b3Proc:getDimX() > ( Part.b3Part:getDimX() - 500 * GEO.EPS_SMALL)) or + ( b3Proc:getDimZ() > ( Part.b3Part:getDimZ() - 500 * GEO.EPS_SMALL) and b3Proc:getDimX() > ( Part.b3Part:getDimX() - 500 * GEO.EPS_SMALL))) end --------------------------------------------------------------------- diff --git a/Strategies/AvailableStrategyList.json b/Strategies/AvailableStrategyList.json index 88d665c..31d21b8 100644 --- a/Strategies/AvailableStrategyList.json +++ b/Strategies/AvailableStrategyList.json @@ -36,7 +36,7 @@ "nGrp": "0", "TopologyList" : [ { "sName": "Feature", - "StrategyList" : [ { "sStrategyID": "STR0010" }] + "StrategyList" : [ { "sStrategyId": "STR0005"}, { "sStrategyID": "STR0010" }] } ] }, @@ -61,22 +61,25 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, { - "sName":"Fron Slot", + "sName":"Front Slot", "nPrc": "17", "nGrp": "0", "TopologyList" : [ @@ -86,17 +89,20 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -106,7 +112,7 @@ "nGrp": "0", "TopologyList" : [ { "sName": "Feature", - "StrategyList" : [ ] + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -125,23 +131,8 @@ "nPrc": "30", "nGrp": "1", "TopologyList" : [ - { "sName": "Pocket-5-Blind", - "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, - { "sName": "Groove-4-Blind", - "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, - { "sName": "Groove-3-Through", - "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, - { "sName": "Groove-3-Blind", - "StrategyList" : [ { "sStrategyID": "STR0002" } ] - }, - { "sName": "Rabbet-2-Through", - "StrategyList" : [ { "sStrategyID": "STR0002" } ] + { "sName": "Feature", + "StrategyList" : [ { "sStrategyId": "STR0011"} ] } ] }, @@ -156,17 +147,20 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -181,17 +175,20 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -216,17 +213,20 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -281,17 +281,20 @@ { "sName": "Groove-4-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, - { "sName": "Tunnel-4-Through", - "StrategyList" : [ { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] - }, { "sName": "Groove-3-Through", "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, { "sName": "Groove-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] }, - { "sName": "Rabbet-2-Through", + { "sName": "Bevel-3-Blind", "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] } ] }, @@ -320,8 +323,35 @@ "nPrc": "50", "nGrp": "0", "TopologyList" : [ - { "sName": "Feature", - "StrategyList" : [ ] + { "sName": "Pocket-5-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-4-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-3-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-3-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Bevel-3-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] + }, + { "sName": "Pocket-Round", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] + }, + { "sName": "Pocket-Round-Front", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] + }, + { "sName": "Pocket-Round-Through", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] } ] }, @@ -330,8 +360,35 @@ "nPrc": "51", "nGrp": "0", "TopologyList" : [ - { "sName": "Feature", - "StrategyList" : [ ] + { "sName": "Pocket-5-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-4-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-3-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Tunnel-4-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyID": "STR0003" }, { "sStrategyID": "STR0004" } ] + }, + { "sName": "Groove-3-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Bevel-3-Blind", + "StrategyList" : [ { "sStrategyID": "STR0002" } ] + }, + { "sName": "Rabbet-2-Through", + "StrategyList" : [ { "sStrategyID": "STR0002" }, { "sStrategyId": "STR0010"} ] + }, + { "sName": "Pocket-Round", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] + }, + { "sName": "Pocket-Round-Front", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] + }, + { "sName": "Pocket-Round-Through", + "StrategyList" : [ { "sStrategyID": "STR0008" } ] } ] },