From 069446eef2eccb722f6e5d0def9117ee198253ee Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 11 May 2017 18:11:49 +0000
Subject: [PATCH] EgtMachKernel 1.8e2 : - corretto calcolo collegamento tra
 lavorazioni con verifica collisioni.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Operation.cpp    |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index a91b74df9d474c7328ee7932ee71be4c9e2784b2..e02f7500c7dea39c3240082c870d22d14854b1e8 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

delta 97
zcmewt{V#gMFE&QQ&A-`fnHdcyKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU3rBY*$^

diff --git a/Operation.cpp b/Operation.cpp
index c081890..b76b94f 100644
--- a/Operation.cpp
+++ b/Operation.cpp
@@ -1149,6 +1149,8 @@ Operation::AdjustStartEndMovements( void)
          else {
            // cancello eventuale risalita parziale della lavorazione precedente
             pPrevOp->RemoveRise() ;
+           // recupero le nuove quote finali (per calcolare il corretto delta)
+            pPrevOp->GetFinalAxesValues( vAxVal) ;
            // aggiungo risalita a Zsafe
             if ( ! pPrevOp->AddRise( vAxVal, dSafeZ - vAxVal[2]))
                return false ;
@@ -1673,7 +1675,7 @@ Operation::TestCollisionAvoid( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEn
   // Vado nelle posizioni da controllare
    const int COLL_STEP = 16 ;
    bool bCollide = false ;
-   for ( int i = 1 ; i < COLL_STEP  &&  ! bCollide ; ++ i) {
+   for ( int i = 0 ; i < COLL_STEP  &&  ! bCollide ; ++ i) {
      // Imposto la posizione
       double dCoeff = double( i) / COLL_STEP ;
       for ( size_t j = 0 ; j < vAxStart.size() ; ++ j) {