diff --git a/Strategies/STR0002/STR0002.lua b/Strategies/STR0002/STR0002.lua index 0e44c2c..12e558e 100644 --- a/Strategies/STR0002/STR0002.lua +++ b/Strategies/STR0002/STR0002.lua @@ -36,13 +36,14 @@ local function CalcMachinedPercentage( Proc, Machining) if Machining.sTypeMachining == 'None' then dPercentage = 0 - elseif Machining.sTypeMachining == 'Bottom' then - dPercentage = dBottomPercentage - elseif Proc.MainFaces.TunnelAddedFaces then + -- Tunnel-4-Through, Groove-3-Through + elseif Proc.Topology.sName == 'Tunnel-4-Through' or Proc.Topology.sName == 'Groove-3-Through' or Proc.Topology.sName == 'Rabbet-2-Through' then local TunnelAddedFacesElevation = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Faces[1].dElevation local dSide1Prercentage = ( ( TunnelAddedFacesElevation * 2) - Machining[2].ToolInfo.dResidualDepth) / ( TunnelAddedFacesElevation * 2) local dSide2Prercentage = ( ( TunnelAddedFacesElevation * 2) - Machining[3].ToolInfo.dResidualDepth) / ( TunnelAddedFacesElevation * 2) - if Machining.sTypeMachining == 'Side1' then + if Machining.sTypeMachining == 'Bottom' then + dPercentage = dBottomPercentage + elseif Machining.sTypeMachining == 'Side1' then dPercentage = dSide1Prercentage elseif Machining.sTypeMachining == 'Side2' then dPercentage = dSide2Prercentage @@ -55,6 +56,10 @@ local function CalcMachinedPercentage( Proc, Machining) elseif Machining.sTypeMachining == 'Side1-Side2' then dPercentage = dSide1Prercentage + dSide2Prercentage end + -- Groove-4-Blind, Groove-3-Blind, Rabbet-2-Through + elseif Proc.Topology.sName == 'Tunnel-4-Blind' or Proc.Topology.sName == 'Groove-3-Blind' then + -- 'Tunnel-4-Blind' : bottom e longface + -- 'Groove-3-Blind' : bottom, longface e sideface end return dPercentage * 100