From cfb2fea0bdd6627485111e68a57482098dc62c82 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Mon, 15 Nov 2021 09:53:18 +0100
Subject: [PATCH] EgtMachKernel 2.3k1 : - modifiche a Mortising per ricalcolo
 elevazione su attacco uscita indipendente da MaxElev.

---
 EgtMachKernel.rc | Bin 11782 -> 11782 bytes
 Mortising.cpp    |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index d266acd50a23310fe789efa079eb4e6214ebe0ea..73bec79e8407069b04d5e0b1153d10dc584d8d78 100644
GIT binary patch
delta 121
zcmZpRX^YwLgN@aYL5IO`^ItY=X69@L!^w`qx|_3v+!!~n<Mv>NOI~D}d`2)2NkJbA
OTn<B{G#-sgbGQL{CnHh-

delta 121
zcmZpRX^YwLgN@aIL5IO&^ItY=X67sgi^-0{x|_3v+!!~n<Mv>NOI~D}d`2)2NkJbA
OTn<B{G#-sgbGQM7XCs0D

diff --git a/Mortising.cpp b/Mortising.cpp
index 98b9a89..1b231a8 100644
--- a/Mortising.cpp
+++ b/Mortising.cpp
@@ -1481,6 +1481,9 @@ Mortising::GenerateMortisingCl( const ICurveComposite* pCompo, const Vector3d& v
    Point3d ptLi = ptStart + vtTool * dDelta ;
    bool bUnderStart = GetPointUnderRaw( ptLi, vtTool, 0,
                                         GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, dStartElev) ;
+  // altrimenti ridetermino elevazione su inizio percorso di lavoro
+   if ( ! bUnderStart)
+      GetElevation( m_nPhase, ptLi, vtTool, GetRadiusForStartEndElevation(), vtTool, dStartElev) ;
 
   // 1 -> punto approccio
    SetFlag( 1) ;
@@ -1562,6 +1565,9 @@ Mortising::GenerateMortisingCl( const ICurveComposite* pCompo, const Vector3d& v
    Point3d ptLo = ptLast + vtTool * dDelta ;
    bool bUnderEnd = GetPointUnderRaw( ptLo, vtTool, 0,
                                       GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, dEndElev) ;
+  // altrimenti ridetermino elevazione su fine percorso di lavoro
+   if ( ! bUnderEnd)
+      GetElevation( m_nPhase, ptLo, vtTool, GetRadiusForStartEndElevation(), vtTool, dEndElev) ;
 
   // 6 -> ritorno all'approccio
    SetFeed( GetEndFeed()) ;