From a0da9d4e7d16d335b490337f1a26322f9c00d306 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Sun, 5 Mar 2023 20:27:02 +0100
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=202.5c1=20:=20-=20cambiato=20nome?=
 =?UTF-8?q?=20parametro=20a=20Operation::GetExtraZ=20per=20renderlo=20pi?=
 =?UTF-8?q?=C3=B9significativo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Operation.cpp    |  10 +++++-----
 Operation.h      |   2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index fea7b8c4d819221bb77e46ae8d9984a1d77ee90b..0722d821246146cfecb4c7430de96b7b7f2f78d9 100644
GIT binary patch
delta 121
zcmewt{V#gMH#Syd1|0^&&A-{KnVFLr3@1O7)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RU-NCWrt4

delta 121
zcmewt{V#gMH#Sxy1|0^o&A-{KnVFLq%qBmS)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RVAFCa3@a

diff --git a/Operation.cpp b/Operation.cpp
index 3b2c772..66c7f2c 100644
--- a/Operation.cpp
+++ b/Operation.cpp
@@ -2930,7 +2930,7 @@ Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR
 bool
 Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1,
                       const DBLVECTOR& vAx2, const Vector3d& vtTool2,
-                      double dSafeZ, double& dExtraZ) const
+                      double dHomeZ, double& dExtraZ) const
 {
   // Recupero macchina corrente
    Machine* pMch = ( m_pMchMgr != nullptr ?  m_pMchMgr->GetCurrMachine() : nullptr) ;
@@ -2952,12 +2952,12 @@ Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1,
    if ( SpecialGetMaxZ( vAx1, vtTool1, vAx2, vtTool2, dMaxZ)) {
      // se caso standard
       if ( ! bZHomeDown) {
-         dExtraZ = min( dMaxZ, dAxZmax) - dSafeZ ;
+         dExtraZ = min( dMaxZ, dAxZmax) - dHomeZ ;
          return ( dExtraZ > EPS_SMALL) ;
       }
      // altrimenti caso con posizione sicura in basso (teste da sotto)
       else {
-         dExtraZ = max( dMaxZ, dAxZmin) - dSafeZ ;
+         dExtraZ = max( dMaxZ, dAxZmin) - dHomeZ ;
          return ( dExtraZ < EPS_SMALL) ;
       }
    }
@@ -2982,14 +2982,14 @@ Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1,
       if ( ! bZHomeDown) {
          double dZmax ;
          pMch->GetCurrAxisMax( 2, dZmax) ;
-         dExtraZ = min( vdVal[0], dZmax - dSafeZ) ;
+         dExtraZ = min( vdVal[0], dZmax - dHomeZ) ;
          return ( dExtraZ > EPS_SMALL) ;
       }
      // altrimenti caso con posizione sicura in basso (teste da sotto)
       else {
          double dZmin ;
          pMch->GetCurrAxisMin( 2, dZmin) ;
-         dExtraZ = max( vdVal[0], dZmin - dSafeZ) ;
+         dExtraZ = max( vdVal[0], dZmin - dHomeZ) ;
          return ( dExtraZ < EPS_SMALL) ;
       }
    }
diff --git a/Operation.h b/Operation.h
index a841f84..84bb986 100644
--- a/Operation.h
+++ b/Operation.h
@@ -136,7 +136,7 @@ class Operation : public IUserObj
       bool   CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd, double& dDeltaZ) const ;
       bool   GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1,
                         const DBLVECTOR& vAx2, const Vector3d& vtTool2,
-                        double dSafeZ, double& dExtraZ) const ;
+                        double dHomeZ, double& dExtraZ) const ;
       bool   SpecialGetMaxZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1,
                              const DBLVECTOR& vAx2, const Vector3d& vtTool2,
                              double& dMaxZ) const ;