From 4a1ae0de846d73e622ef7785806b79a9e6064d07 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 8 May 2026 11:11:20 +0200
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=203.1e2=20:=20-=20correzione=20sc?=
 =?UTF-8?q?elta=20angoli=20pi=C3=B9=20vicini=20a=20iniziale=20quando=20imp?=
 =?UTF-8?q?osto=20anche=20MaxDeltaR2OnFirst=20-=20correzione=20gestione=20?=
 =?UTF-8?q?soluzione=20indeterminata=20quando=20si=20=C3=A8=20nel=20cono?=
 =?UTF-8?q?=20dichiarato=20di=20singolarit=C3=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 GeoCalc.cpp      |   9 +++++++--
 Operation.cpp    |   9 +++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 9436fcaba6bc23cb05176c85f35ba5f6a0c78c0b..43a38469eb2afe47673c3ed79e7eff3684227cd0 100644
GIT binary patch
delta 236
zcmewt{V#gMI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0IklxX
ze_&=~W;ELTUhX2(<P)4ZK&GKoDdXl<+#V2NM-XMG1QHU43L&Z7%L3L5Rg_Jt^#><&
nF)y2}rOv|(a;PWRX*mp)Acsx<z?`-DjJggps?=sq?XOG#vj{!|

delta 241
zcmewt{V#gMI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731Uz7R&U)L$1;bB
z(Qxx`Hd|&!!^saNbvLJRO<)0wTx6PjLa+cPDg+fpQs=?Ad6l#WP#;h`nqrWY@;63e
oowE6~YB8f=KG?0EV7KM~-I%!9TYV!lrtsv`ss}fp(l%iN08+|C82|tP

diff --git a/GeoCalc.cpp b/GeoCalc.cpp
index 3055488..a7d583b 100644
--- a/GeoCalc.cpp
+++ b/GeoCalc.cpp
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2015
+//  EgalTech 2015-2026
 //----------------------------------------------------------------------------
-// File : GeoCalc.cpp       Data : 12.05.15          Versione : 1.6e3
+// File : GeoCalc.cpp       Data : 08.05.26          Versione : 3.1e2
 // Contenuto : Funzioni varie e speciali di calcolo geometrico.
 //
 //
@@ -14,6 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "GeoCalc.h"
+#include "\EgtDev\Include\EGkAngle.h"
 
 //----------------------------------------------------------------------------
 int
@@ -86,6 +87,10 @@ GetRotationComponent( const Vector3d& vtDir1, double dComp, const Vector3d& vtDi
       double dDeltaAngRad = acos( dNumer / dDenom) ;
       dAng1Deg = ( dOffsAngRad + dDeltaAngRad) * RADTODEG ;
       dAng2Deg = ( dOffsAngRad - dDeltaAngRad) * RADTODEG ;
+      if ( abs( dAng1Deg) <= abs( dAng2Deg))
+         dAng2Deg = AngleNearAngle( dAng2Deg, dAng1Deg) ;
+      else
+         dAng1Deg = AngleNearAngle( dAng1Deg, dAng2Deg) ;
       bDet = true ;
       return 2 ;
    }  
diff --git a/Operation.cpp b/Operation.cpp
index 225aea7..b9d5bbe 100644
--- a/Operation.cpp
+++ b/Operation.cpp
@@ -2497,13 +2497,14 @@ Operation::CalculateMcentRotAxesValues( bool bFirst, const Vector3d& vtTool, con
          dDelta1 += abs( vAng1[i] - vAxRotPrec[i]) * ( bFirst ? pMachine->GetCurrRot1W() : 1) ;
          dDelta2 += abs( vAng2[i] - vAxRotPrec[i]) * ( bFirst ? pMachine->GetCurrRot1W() : 1) ;
       }
-      if ( bAng2  &&  ( dDelta2 < dDelta1 - EPS_ANG_SMALL  ||  ! bAng1))
+      if ( bAng2  &&  ( dDelta2 < dDelta1 - 10 * EPS_ANG_SMALL  ||  ! bAng1))
          swap( vAng1, vAng2) ;
      // se imposto limite su variazione di secondo asse rotante
       if ( ( pMachine->GetCurrCalcMaxDeltaR2OnFirst()  ||  ! bFirst)  &&  dMaxDeltaR2 > EPS_ANG_SMALL  &&  vAng1.size() >= 2) {
-         double dR2Diff1 = vAng1[1] - vAxRotPrec[1] ;
-         double dR2Diff2 = vAng2[1] - vAxRotPrec[1] ;
-         if ( abs( dR2Diff1) > abs( dR2Diff2)  &&  abs( dR2Diff1) > dMaxDeltaR2)
+         double dR2Diff1 = abs( vAng1[1] - vAxRotPrec[1]) ;
+         double dR2Diff2 = abs( vAng2[1] - vAxRotPrec[1]) ;
+         if ( dR2Diff1 > dR2Diff2 + 10 * EPS_ANG_SMALL  &&
+              dR2Diff1 > dMaxDeltaR2  &&  ( dR2Diff2 < dMaxDeltaR2  ||  dR2Diff2 < dR2Diff1 - dMaxDeltaR2))
             swap( vAng1, vAng2) ;
       }
    }