From 1a658822fe3fac2af6baf492b37e444750a2f414 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Thu, 22 Apr 2021 22:51:54 +0200
Subject: [PATCH] DataWall : - correzioni a svuotature di FreeContour.

---
 LuaLibs/WProcessFreeContour.lua | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/LuaLibs/WProcessFreeContour.lua b/LuaLibs/WProcessFreeContour.lua
index 2263e93..89724d9 100644
--- a/LuaLibs/WProcessFreeContour.lua
+++ b/LuaLibs/WProcessFreeContour.lua
@@ -1,4 +1,4 @@
--- ProcessFreeContour.lua by Egaltech s.r.l. 2021/04/13
+-- ProcessFreeContour.lua by Egaltech s.r.l. 2021/04/22
 -- Gestione calcolo profilo libero per Pareti
 
 -- Tabella per definizione modulo
@@ -1843,11 +1843,11 @@ local function MakeByPocket( Proc, nRawId, b3Raw)
    local nFacet
    local dDiam
    local dElev
-   -- cerco la faccia di fondo della superfice per calcolare le dimensioni del rettangolo
+   -- cerco la faccia di fondo della superfice (deve avere direzione circa quella di estrusione della curva)
    for i = 1, Proc.Fct do
       local _, vtN = EgtSurfTmFacetCenter( Proc.Id, i-1, GDB_ID.ROOT)
-      if AreSameVectorApprox( vtN, Z_AX()) or AreSameVectorApprox( -vtN, Z_AX()) then
-         nFacet = i-1
+      if abs( vtN * vtExtr) > 0.99 then
+         nFacet = i - 1
          break
       end
    end
@@ -1937,7 +1937,20 @@ local function MakeByPocket( Proc, nRawId, b3Raw)
    -- imposto elevazione
    EgtSetMachiningParam( MCH_MP.USERNOTES, 'MaxElev=' .. EgtNumToString( EgtIf( bPocketBotface, min( dElev, dMaxDepth), dMaxDepth), 1) .. ';')
    -- eseguo
-   if not EgtApplyMachining( true, false) then
+   local bAppOk = EgtApplyMachining( true, false)
+   if not bAppOk and not bPocketBotface then
+      EgtSetMachiningGeometry( {{ Proc.Id, nFacet}})
+      dDepth = 0
+      local dThElev = dThDiam / 2 * sqrt( vtExtr:getX() * vtExtr:getX() + vtExtr:getY() * vtExtr:getY())
+      if dElev + dThElev > dMaxDepth + 10 * GEO.EPS_SMALL then
+         dDepth = dMaxDepth - dElev - dThElev
+         sWarn = 'Warning : elevation bigger than max tool depth'
+         EgtOutLog( sWarn)
+      end
+      EgtSetMachiningParam( MCH_MP.DEPTH, dDepth)
+      bAppOk = EgtApplyMachining( true, false)
+   end
+   if not bAppOk then
       local _, sErr = EgtGetLastMachMgrError()
       EgtSetOperationMode( nMchFId, false)
       return false, sErr