From 5979383e25e4161ca475ddd6e75c75d6e8eda9a9 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 26 Mar 2021 11:20:25 +0000
Subject: [PATCH] DataWall : - correzioni per lavorazioni di tasche.

---
 LuaLibs/WProcessLapJoint.lua | 12 ++++++------
 LuaLibs/WallExec.lua         | 17 +++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/LuaLibs/WProcessLapJoint.lua b/LuaLibs/WProcessLapJoint.lua
index 867caaf..eaab329 100644
--- a/LuaLibs/WProcessLapJoint.lua
+++ b/LuaLibs/WProcessLapJoint.lua
@@ -1234,12 +1234,12 @@ local function MakeByPocketing( Proc, nFacet, nRawId, b3Raw, bCheckQPar)
    local nAddGrpId = WL.GetAddGroup( Proc.PartId)
    local nNewProc, nNumFacet = RemoveBottomFaceAndReorder( Proc, nAddGrpId, nFacet)
    -- se ho forma a L
-   local bIsL = ( nNumFacet == 2 or TestElleShape3( nNewProc, nNumFacet) or TestElleShape4( nNewProc, nNumFacet) == 2)
-      -- verifico se U
-   local bIsU = ( nNumFacet == 3 and not TestElleShape3( nNewProc, nNumFacet))
+   local bIsL = ( Proc.Fct == 2 or TestElleShape3( Proc.Id, Proc.Fct) or TestElleShape4( Proc.Id, Proc.Fct) == 2)
+   -- verifico se U
+   local bIsU = ( Proc.Fct == 3 and not TestElleShape3( Proc.Id, Proc.Fct))
    local dMiddleFacetLength = 0
    if bIsU then
-      local _, dH2, dV2 = EgtSurfTmFacetMinAreaRectangle( nNewProc, 1, GDB_ID.ROOT)
+      local _, dH2, dV2 = EgtSurfTmFacetMinAreaRectangle( Proc.Id, nFacet, GDB_ID.ROOT)
       -- prendo la linea di base
       if abs( dElev - dH2) < 1 and abs ( dElev - dV2) > 1 then
          dMiddleFacetLength = dV2
@@ -1422,8 +1422,8 @@ local function MakeTwoFaces( Proc, nRawId, b3Raw)
             return true
          end
       end
-      -- se non inclinate o capacità di taglio non sufficiente, provo con contornatura o svuotatura
-      if not sCutting or dSawMaxDepth < dDimY[1] + WD.CUT_SIC or dSawMaxDepth < dDimY[2] + WD.CUT_SIC then
+      -- se non inclinate o capacità di taglio non sufficiente o non molto grandi (80mm), provo con contornatura o svuotatura
+      if not sCutting or dSawMaxDepth < dDimY[1] + WD.CUT_SIC or dSawMaxDepth < dDimY[2] + WD.CUT_SIC or dDimY[1] < 80 or dDimY[2] < 80 then
          -- eseguo la svuotatura
          return MakeByPocketing( Proc, nFacet, nRawId, b3Raw)
       end
diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua
index 31ef735..5e42848 100644
--- a/LuaLibs/WallExec.lua
+++ b/LuaLibs/WallExec.lua
@@ -1,4 +1,4 @@
--- WallExec.lua by Egaltech s.r.l. 2021/03/24
+-- WallExec.lua by Egaltech s.r.l. 2021/03/25
 -- Libreria esecuzione lavorazioni per Pareti
 
 -- Tabella per definizione modulo
@@ -9,20 +9,25 @@ require( 'EgtBase')
 
 -- Carico i dati globali e libero tutti gli altri
 _G.package.loaded.WallData = nil
+_G.package.loaded.CutData = nil
+_G.package.loaded.MillingData = nil
+_G.package.loaded.PocketingData = nil
+_G.package.loaded.DrillData = nil
+_G.package.loaded.SawingData = nil
 local WD = require( 'WallData')
 
 -- Carico le librerie
 _G.package.loaded.WMachiningLib = nil
-local WM = require( 'WMachiningLib')
 _G.package.loaded.WallLib = nil
-local WL = require( 'WallLib')
 _G.package.loaded.WProcessCut = nil
-local Cut = require( 'WProcessCut')
 _G.package.loaded.WProcessLapJoint = nil
-local LapJoint = require( 'WProcessLapJoint')
 _G.package.loaded.WProcessDrill = nil
-local Drill = require( 'WProcessDrill')
 _G.package.loaded.WProcessFreeContour = nil
+local WM = require( 'WMachiningLib')
+local WL = require( 'WallLib')
+local Cut = require( 'WProcessCut')
+local LapJoint = require( 'WProcessLapJoint')
+local Drill = require( 'WProcessDrill')
 local FreeContour = require( 'WProcessFreeContour')
 
 -------------------------------------------------------------------------------------------------------------