From 862751c84a6ec459e1106df21f8d976ecc7fe3da Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Wed, 21 Aug 2024 13:05:31 +0200
Subject: [PATCH] =?UTF-8?q?-=20in=20FacesBySaw=20attacchi=20tangenziali=20?=
 =?UTF-8?q?solo=20da=20un=20lato=20limitati=20a=20facce=20con=20Z=20negati?=
 =?UTF-8?q?ve=20-=20in=20BatchProcess=20e=20New=20si=20verifica=20l'abilit?=
 =?UTF-8?q?azione=20della=20generazione=20con=20EgtVerifyKeyOption=20-=20i?=
 =?UTF-8?q?n=20Version,=20MIN=5FEXE=20modificato=20per=20richiesta=20compa?=
 =?UTF-8?q?tibilit=C3=A0=20con=20EgtVerifyKeyOption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BatchProcess.lua       | 3 ++-
 BatchProcessNew.lua    | 2 +-
 LuaLibs/FacesBySaw.lua | 6 +++---
 Version.lua            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/BatchProcess.lua b/BatchProcess.lua
index b367ab6..468de84 100644
--- a/BatchProcess.lua
+++ b/BatchProcess.lua
@@ -525,7 +525,8 @@ if  ( BEAM.FLAG == 0 and ( bToProcess or bToRecalc)) or BEAM.FLAG == 3 or BEAM.F
 end
 
 -- *** Genero programma CN *** ( se richiesto)
-if BEAM.FLAG == 0 or BEAM.FLAG == 4 then
+local bIsGenerationEnabled = ( EgtVerifyKeyOption( 110) == false)
+if bIsGenerationEnabled and ( BEAM.FLAG == 0 or BEAM.FLAG == 4) then
    EgtOutLog( ' +++ Generating NC part program >>>')
    local sInfo = 'EgtCAM5' .. EgtIf( EgtIs64bit(), ' 64bit', '')
    if EgtGetExeVersion then
diff --git a/BatchProcessNew.lua b/BatchProcessNew.lua
index 1cfee79..282124b 100644
--- a/BatchProcessNew.lua
+++ b/BatchProcessNew.lua
@@ -626,7 +626,7 @@ if  ( BEAM.FLAG == 0 and ( bToProcess or bToRecalc)) or BEAM.FLAG == 3 or BEAM.F
 end
 
 -- *** Genero programma CN *** ( se richiesto)
-local bIsGenerationEnabled = ( EgtGetNumberFromIni( 'Mach', 'NoPartProgram', 0, EgtGetIniFile()) == 0)
+local bIsGenerationEnabled = ( EgtVerifyKeyOption( 110) == false)
 if bIsGenerationEnabled and ( BEAM.FLAG == 0 or BEAM.FLAG == 4) then
    EgtOutLog( ' +++ Generating NC part program >>>')
    local sInfo = 'EgtCAM5' .. EgtIf( EgtIs64bit(), ' 64bit', '')
diff --git a/LuaLibs/FacesBySaw.lua b/LuaLibs/FacesBySaw.lua
index ead6a40..9bbb09d 100644
--- a/LuaLibs/FacesBySaw.lua
+++ b/LuaLibs/FacesBySaw.lua
@@ -338,13 +338,13 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
    local dLo2Perp = 0
    local dLi2CompLength = 0
 
-   -- si predilige un attacco tangenziale (con calcolo automatico di quanto uscire) se faccia non troppo orientata verso X e linea non troppo inclinata in X
+   -- si predilige un attacco tangenziale (con calcolo automatico di quanto uscire) se faccia che guarda in giù, non troppo orientata verso X e linea non troppo inclinata in X
    -- non si fa se macchina tipo PF e pezzo alto perchè la lama, uscendo da sopra, toccherebbe la traversa
    -- TODO si potranno togliere i limiti sulle normali quando si implementerà un modo per calcolare Lead In / Out correttamente in tutti i casi
    -- 
-   if bSpecialTangentLeadInOut and not bIsBiLinea and ( abs( vtN:getX()) < 0.5) and ( abs( vtTg:getX()) < 0.1736) and ( abs( vtN:getY()) < 0.5 or ( BD.MAX_DIM_HTCUT_HBEAM > 0 or ( b3Raw:getDimZ() < 420))) then
+   if bSpecialTangentLeadInOut and not bIsBiLinea and ( vtN:getZ() < - 0.087) and ( abs( vtN:getX()) < 0.258) and ( abs( vtTg:getX()) < 0.1736) and ( abs( vtN:getY()) < 0.5 or ( BD.MAX_DIM_HTCUT_HBEAM > 0 or ( b3Raw:getDimZ() < 420))) then
       dLi2Tang = 0
-      dLi2Perp = BD.MAX_DIM_DICE + BD.CUT_EXTRA
+      dLi2Perp = BD.CUT_EXTRA
       dLi2CompLength = dLen + dSawDiam / 2 + BD.COLL_SIC
       dLo2Tang = dSawDiam / 2
    else
diff --git a/Version.lua b/Version.lua
index 0772dd6..fcf9c4b 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,4 +3,4 @@
 
 NAME = 'Beam'
 VERSION = '2.6h1'
-MIN_EXE = '2.6e2'
+MIN_EXE = '2.6h1'