From 435075014de194b6060bcc7e6644fd5f69c23415 Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Tue, 4 Jun 2024 09:02:19 +0200
Subject: [PATCH] Corretto problema su calcolo percentuale lavorata. Da
 utlimare

---
 Strategies/STR0002/STR0002.lua | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Strategies/STR0002/STR0002.lua b/Strategies/STR0002/STR0002.lua
index 77dc705..b6dd8b0 100644
--- a/Strategies/STR0002/STR0002.lua
+++ b/Strategies/STR0002/STR0002.lua
@@ -29,20 +29,21 @@ end
 
 -------------------------------------------------------------------------------------------------------------
 local function CalcMachinedPercentage( Proc, Machining)
-   local dPercentage
+   local dPercentage = 0
    local dBottomElevation = Proc.MainFaces.BottomFace.dElevation
    local dBottomPercentage = ( dBottomElevation - Machining[1].ToolInfo.dResidualDepth) / dBottomElevation
    local dBottomPercentageLeft = 1 - dBottomPercentage
 
    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