From 02bddc6c9eb279ef2ce884a6c5b02b00d05323c4 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 12 Dec 2020 10:45:49 +0000
Subject: [PATCH] DataBeam : - piccole correzioni e migliorie.

---
 LuaLibs/ProcessLapJoint.lua   | 14 +++++++++++---
 LuaLibs/ProcessScarfJoint.lua |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua
index fde22d9..cc329a9 100644
--- a/LuaLibs/ProcessLapJoint.lua
+++ b/LuaLibs/ProcessLapJoint.lua
@@ -1,4 +1,4 @@
--- ProcessLapJoint.lua by Egaltech s.r.l. 2020/12/09
+-- ProcessLapJoint.lua by Egaltech s.r.l. 2020/12/10
 -- Gestione calcolo mezzo-legno per Travi
 -- 2019/10/08 Agg. gestione OpenPocket.
 
@@ -1315,7 +1315,7 @@ local function MakeCleanCorner( Proc, nPhase, nRawId, nPartId, b3Raw, nFacInd, n
       nAuxId = EgtLine( nAddGrpId, ptApPoint, tFacAdj[nIdLine][nIdEndPoint], GDB_RT.GLOB)
       table.insert( pAuxId, nAuxId)
    end
-   -- inserisco le ultime tre linee
+   -- inserisco le ultime tre linee + uscita discostata rispetto all'ingresso
    -- trovo il secondo punto sulla superfice di riferimento
    _, ptLocP1, ptLocP2, _ = EgtSurfTmFacetsContact( Proc.Id, nFacInd, tFacAdj[nIdLine][2], GDB_ID.ROOT)
    if ptLocP1 and ptLocP2 then
@@ -1337,8 +1337,11 @@ local function MakeCleanCorner( Proc, nPhase, nRawId, nPartId, b3Raw, nFacInd, n
       -- creo linea di ritorno
       nAuxId = EgtLine( nAddGrpId, ptApPoint, tFacAdj[nIdLine][nIdEndPoint], GDB_RT.GLOB)
       table.insert( pAuxId, nAuxId)
+      -- piccolo scostamento di 2mm dall'angolo
+      nAuxId = EgtLine( nAddGrpId, tFacAdj[nIdLine][nIdEndPoint], tFacAdj[nIdLine][nIdEndPoint] + ( 2 * vtExtr), GDB_RT.GLOB)
+      table.insert( pAuxId, nAuxId)
       -- ultima linea di risalita
-      nAuxId = EgtLine( nAddGrpId, tFacAdj[nIdLine][nIdEndPoint], tFacAdj[nIdLine][nIdIniPoint], GDB_RT.GLOB)
+      nAuxId = EgtLine( nAddGrpId, tFacAdj[nIdLine][nIdEndPoint] + ( 2 * vtExtr), tFacAdj[nIdLine][nIdIniPoint] + ( 2 * vtExtr), GDB_RT.GLOB)
       table.insert( pAuxId, nAuxId)
    end
    -- trasformo in percorso
@@ -3252,6 +3255,11 @@ local function MakeMoreFaces( Proc, nPhase, nRawId, nPartId, dOvmHead, bSinglePa
                   local bOk
                   bOk, sWarn = MakeDrillOnCorner( Proc, nPhase, nRawId, nPartId, b3Raw, 0, nAddGrpId, dDiamTool, true)
                   if not bOk then return false, sWarn end
+               -- altrimenti se abilitato dal parametro Q inserisco percorso di pulitura
+               elseif EgtGetInfo( Proc.Id, sInsertBoreOnCorner, 'i') == 2 then
+                  local bOk
+                  bOk, sWarn = MakeCleanCorner( Proc, nPhase, nRawId, nPartId, b3Raw, 0, nAddGrpId, dDiamTool)
+                  if not bOk then return false, sWarn end
                end
             end
          -- altrimenti lavorazione di svuotatura o contornatura
diff --git a/LuaLibs/ProcessScarfJoint.lua b/LuaLibs/ProcessScarfJoint.lua
index 9d01b59..270a690 100644
--- a/LuaLibs/ProcessScarfJoint.lua
+++ b/LuaLibs/ProcessScarfJoint.lua
@@ -1,4 +1,4 @@
--- ProcessScarfJoint.lua by Egaltech s.r.l. 2020/12/04
+-- ProcessScarfJoint.lua by Egaltech s.r.l. 2020/12/10
 -- Gestione calcolo giunto Gerber per Travi
 
 -- Tabella per definizione modulo
@@ -485,6 +485,7 @@ function ProcessScarfJoint.Make( Proc, nPhase, nRawId, nPartId, dOvmHead)
       else
          dHCI = b3Raw:getMax():getX() - dOvmHead - Proc.Box:getMin():getX()
       end
+      dHCI = 0.75 * dHCI
       BL.UpdateHCING( nRawId, dHCI)
    elseif Proc.Tail then
       local dTCI = 0
@@ -494,6 +495,7 @@ function ProcessScarfJoint.Make( Proc, nPhase, nRawId, nPartId, dOvmHead)
       else
          dTCI = Proc.Box:getMax():getX() - b3Solid:getMin():getX()
       end
+      dTCI = 0.75 * dTCI
       BL.UpdateTCING( nRawId, dTCI)
    end