diff --git a/Strategies/Standard/STR0001/STR0001.json b/Strategies/Standard/STR0001/STR0001.json index 281c072..e99f7a0 100644 --- a/Strategies/Standard/STR0001/STR0001.json +++ b/Strategies/Standard/STR0001/STR0001.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0001", + "sStrategyName": "DoveTail Tenon", "ParameterList" : [ { "sName": "dOverMatOnLength", diff --git a/Strategies/Standard/STR0002/STR0002.json b/Strategies/Standard/STR0002/STR0002.json index e2441dd..7333ee5 100644 --- a/Strategies/Standard/STR0002/STR0002.json +++ b/Strategies/Standard/STR0002/STR0002.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0002", + "sStrategyName": "Pocketing", "ParameterList" : [ { "sName": "dMaxCornerRadius", diff --git a/Strategies/Standard/STR0002/STR0002.lua b/Strategies/Standard/STR0002/STR0002.lua index ddbbbe4..5e29049 100644 --- a/Strategies/Standard/STR0002/STR0002.lua +++ b/Strategies/Standard/STR0002/STR0002.lua @@ -307,7 +307,12 @@ local function GetBestPocketingStrategy( Proc) -- se la 3 completa tutto elseif Machining[3].bIsApplicable and Machining[3].ToolInfo.dResidualDepth < 10 * GEO.EPS_SMALL then Machining.sTypeMachining = 'Side1' - Strategy.Result.sStatus = 'Completed' + -- TODO setto non completo perchè è rimasto il raggio sullo spigolo. E' giusto considerare non completo? + if Proc.Topology.sName == 'Groove-3-Through' or Proc.Topology.sName == 'Rabbet-2-Through' or Proc.Topology.sName == 'VGroove-2-Through' then + Strategy.Result.sStatus = 'Not-Completed' + else + Strategy.Result.sStatus = 'Completed' + end Strategy.Result.nCompletionIndex = FeatureLib.GetFeatureCompletionIndex( 100) Strategy.Result.nQuality = FeatureLib.GetFeatureQuality( 'RadiusOnCornerLeft') Strategy.Result.dMRR = Machining[3].dMRR @@ -323,7 +328,12 @@ local function GetBestPocketingStrategy( Proc) -- se la 4 completa tutto elseif Machining[4].bIsApplicable and Machining[4].ToolInfo.dResidualDepth < 10 * GEO.EPS_SMALL then Machining.sTypeMachining = 'Side2' - Strategy.Result.sStatus = 'Completed' + -- TODO setto non completo perchè è rimasto il raggio sullo spigolo. E' giusto considerare non completo? + if Proc.Topology.sName == 'Groove-3-Through' or Proc.Topology.sName == 'Rabbet-2-Through' or Proc.Topology.sName == 'VGroove-2-Through' then + Strategy.Result.sStatus = 'Not-Completed' + else + Strategy.Result.sStatus = 'Completed' + end Strategy.Result.nCompletionIndex = FeatureLib.GetFeatureCompletionIndex( 100) Strategy.Result.nQuality = FeatureLib.GetFeatureQuality( 'RadiusOnCornerLeft') Strategy.Result.dMRR = Machining[4].dMRR @@ -336,11 +346,16 @@ local function GetBestPocketingStrategy( Proc) Machining[2].bIsApplicable = false Machining[3].bIsApplicable = false return Machining - -- se tunnel 2+3 completa tutto + -- se tunnel 3+4 completa tutto elseif Proc.MainFaces.TunnelAddedFaces and Machining[3].bIsApplicable and Machining[4].bIsApplicable and Machining[3].ToolInfo.dResidualDepth + Machining[4].ToolInfo.dResidualDepth < (Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].dElevation * 2) + BeamData.MILL_OVERLAP then Machining.sTypeMachining = 'Side1-Side2' - Strategy.Result.sStatus = 'Completed' + -- TODO setto non completo perchè è rimasto il raggio sullo spigolo. E' giusto considerare non completo? + if Proc.Topology.sName == 'Groove-3-Through' or Proc.Topology.sName == 'Rabbet-2-Through' or Proc.Topology.sName == 'VGroove-2-Through' then + Strategy.Result.sStatus = 'Not-Completed' + else + Strategy.Result.sStatus = 'Completed' + end Machining[3].ToolInfo.dResidualDepth = Machining[3].ToolInfo.dResidualDepth - Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].dElevation Machining[4].ToolInfo.dResidualDepth = -Machining[3].ToolInfo.dResidualDepth - BeamData.MILL_OVERLAP Strategy.Result.nCompletionIndex = FeatureLib.GetFeatureCompletionIndex( 100) diff --git a/Strategies/Standard/STR0003/STR0003.json b/Strategies/Standard/STR0003/STR0003.json index f238200..113f7eb 100644 --- a/Strategies/Standard/STR0003/STR0003.json +++ b/Strategies/Standard/STR0003/STR0003.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0003", + "sStrategyName": "Blade plus ChainSaw", "ParameterList" : [ { "sName": "bFinishWithChainSaw", diff --git a/Strategies/Standard/STR0004/STR0004.json b/Strategies/Standard/STR0004/STR0004.json index 10bcc09..7524465 100644 --- a/Strategies/Standard/STR0004/STR0004.json +++ b/Strategies/Standard/STR0004/STR0004.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0004", + "sStrategyName": "ChainSaw", "ParameterList" : [ { "sName": "bUseZigZagMortising", diff --git a/Strategies/Standard/STR0005/STR0005.json b/Strategies/Standard/STR0005/STR0005.json index 81d6381..996643e 100644 --- a/Strategies/Standard/STR0005/STR0005.json +++ b/Strategies/Standard/STR0005/STR0005.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0005", + "sStrategyName": "Blade", "ParameterList" : [ { "sName": "bForceLongcutBlade", diff --git a/Strategies/Standard/STR0006/STR0006.json b/Strategies/Standard/STR0006/STR0006.json index e5c0019..ea05496 100644 --- a/Strategies/Standard/STR0006/STR0006.json +++ b/Strategies/Standard/STR0006/STR0006.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0006", + "sStrategyName": "Tenon", "ParameterList" : [ { "sName": "dOverMatOnLength", diff --git a/Strategies/Standard/STR0007/STR0007.json b/Strategies/Standard/STR0007/STR0007.json index 36cca7b..d42eb1e 100644 --- a/Strategies/Standard/STR0007/STR0007.json +++ b/Strategies/Standard/STR0007/STR0007.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0007", + "sStrategyName": "DoveTail Mortise", "ParameterList" : [ { "sName": "dOverMatOnLength", diff --git a/Strategies/Standard/STR0008/STR0008.json b/Strategies/Standard/STR0008/STR0008.json index eaccfde..ffdd982 100644 --- a/Strategies/Standard/STR0008/STR0008.json +++ b/Strategies/Standard/STR0008/STR0008.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0008", + "sStrategyName": "Mortise", "ParameterList" : [ { "sName": "dOverMatOnLength", diff --git a/Strategies/Standard/STR0009/STR0009.json b/Strategies/Standard/STR0009/STR0009.json index 5880832..541aaad 100644 --- a/Strategies/Standard/STR0009/STR0009.json +++ b/Strategies/Standard/STR0009/STR0009.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0009", + "sStrategyName": "Mill Heading", "ParameterList" : [ { "sName": "dDepthChamfer", diff --git a/Strategies/Standard/STR0010/STR0010.json b/Strategies/Standard/STR0010/STR0010.json index d820624..11a8b69 100644 --- a/Strategies/Standard/STR0010/STR0010.json +++ b/Strategies/Standard/STR0010/STR0010.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0010", + "sStrategyName": "Milling", "ParameterList" : [ { "sName": "dAntiSplintWithBlade", diff --git a/Strategies/Standard/STR0011/STR0011.json b/Strategies/Standard/STR0011/STR0011.json index 139439d..91af72d 100644 --- a/Strategies/Standard/STR0011/STR0011.json +++ b/Strategies/Standard/STR0011/STR0011.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0011", + "sStrategyName": "Hole with Drillbit", "ParameterList" : [ ] } \ No newline at end of file diff --git a/Strategies/Standard/STR0012/STR0012.json b/Strategies/Standard/STR0012/STR0012.json index b6e504f..07e393f 100644 --- a/Strategies/Standard/STR0012/STR0012.json +++ b/Strategies/Standard/STR0012/STR0012.json @@ -1,5 +1,6 @@ { "sStrategyId": "STR0012", + "sStrategyName": "RidgeLap with Blade", "ParameterList" : [ { "sName": "dExtendAfterTail",