From 40f1e051a42509a46e468aea98aa5ea78a5dea88 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 9 Apr 2026 09:47:25 +0200
Subject: [PATCH] EgtMachKernel 3.1d3 : - piccole razionalizzazioni.

---
 EgtMachKernel.rc              | Bin 11774 -> 11774 bytes
 EgtMachKernel.vcxproj         |   6 ++++++
 EgtMachKernel.vcxproj.filters |  18 ++++++++++++++++++
 MachMgrDBTools.cpp            |   3 ++-
 Machining.cpp                 |   3 ++-
 OperUserNotesConst.h          |   1 +
 Operation.cpp                 |   2 +-
 ToolUserNotesConst.h          |  22 ++++++++++++++++++++++
 8 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 ToolUserNotesConst.h

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 2daa5cc1a7771a980430d04c2a4c47d0bd535689..f55ad18357ca7c94b37f40afd559873a62aeee4c 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUD-Bai?9

delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

diff --git a/EgtMachKernel.vcxproj b/EgtMachKernel.vcxproj
index bd6e0e8..e9d6124 100644
--- a/EgtMachKernel.vcxproj
+++ b/EgtMachKernel.vcxproj
@@ -331,6 +331,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="..\Include\EGkCurvePointDiffGeom.h" />
     <ClInclude Include="..\Include\EGkDistPointCurve.h" />
     <ClInclude Include="..\Include\EGkDistPointLine.h" />
+    <ClInclude Include="..\Include\EGkDistPointSurfFr.h" />
     <ClInclude Include="..\Include\EGkDistPointSurfTm.h" />
     <ClInclude Include="..\Include\EGkExtText.h" />
     <ClInclude Include="..\Include\EGkFrame3d.h" />
@@ -348,6 +349,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="..\Include\EGkHashGrids2d.h" />
     <ClInclude Include="..\Include\EGkIntersCurves.h" />
     <ClInclude Include="..\Include\EGkIntersCurveSurfTm.h" />
+    <ClInclude Include="..\Include\EGkIntersLineBox.h" />
     <ClInclude Include="..\Include\EGkIntersLineSurfTm.h" />
     <ClInclude Include="..\Include\EGkIntersLineTria.h" />
     <ClInclude Include="..\Include\EGkIntersPlaneSurfTm.h" />
@@ -368,12 +370,15 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="..\Include\EGkSelection.h" />
     <ClInclude Include="..\Include\EGkSfrCreate.h" />
     <ClInclude Include="..\Include\EGkStmFromCurves.h" />
+    <ClInclude Include="..\Include\EGkStmFromTriangleSoup.h" />
     <ClInclude Include="..\Include\EGkStmStandard.h" />
     <ClInclude Include="..\Include\EGkStringUtils3d.h" />
     <ClInclude Include="..\Include\EGkSurf.h" />
+    <ClInclude Include="..\Include\EGkSurfBezier.h" />
     <ClInclude Include="..\Include\EGkSurfFlatRegion.h" />
     <ClInclude Include="..\Include\EGkSurfLocal.h" />
     <ClInclude Include="..\Include\EGkSurfTriMesh.h" />
+    <ClInclude Include="..\Include\EGkSurfTriMeshAux.h" />
     <ClInclude Include="..\Include\EGkTriangle3d.h" />
     <ClInclude Include="..\Include\EGkUiUnits.h" />
     <ClInclude Include="..\Include\EGkUserObj.h" />
@@ -480,6 +485,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="TcPos.h" />
     <ClInclude Include="ToolData.h" />
     <ClInclude Include="ToolsMgr.h" />
+    <ClInclude Include="ToolUserNotesConst.h" />
     <ClInclude Include="WaterJetting.h" />
     <ClInclude Include="WaterJettingData.h" />
   </ItemGroup>
diff --git a/EgtMachKernel.vcxproj.filters b/EgtMachKernel.vcxproj.filters
index c633d5e..f15de50 100644
--- a/EgtMachKernel.vcxproj.filters
+++ b/EgtMachKernel.vcxproj.filters
@@ -785,6 +785,24 @@
     <ClInclude Include="OperUserNotesConst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ToolUserNotesConst.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkDistPointSurfFr.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkIntersLineBox.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkStmFromTriangleSoup.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkSurfBezier.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkSurfTriMeshAux.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="EgtMachKernel.rc">
diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 5af1a16..17c33f3 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -15,6 +15,7 @@
 #include "stdafx.h"
 #include "DllMain.h"
 #include "MachMgr.h"
+#include "ToolUserNotesConst.h"
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGnFileUtils.h"
 #include "/EgtDev/Include/EgtIniFile.h"
@@ -881,7 +882,7 @@ MachMgr::GetToolHolderPath( const string& sHeadName, int nExit, int nType, const
   // Verifico se sovrascritto da nota dell'utensile
    string sVal ;
    if ( ! sUserNotes.empty()  &&
-        GetValInNotes( sUserNotes, "TH", sVal)  &&
+        GetValInNotes( sUserNotes, TUN_TH, sVal)  &&
         ExistsFile( sToolHolderDir + "\\" + sVal))
       sToolHolder = sVal ;
   // Se non trovato ancora, esco
diff --git a/Machining.cpp b/Machining.cpp
index f14ac0f..8827c41 100644
--- a/Machining.cpp
+++ b/Machining.cpp
@@ -17,6 +17,7 @@
 #include "MachMgr.h"
 #include "Machining.h"
 #include "OperUserNotesConst.h"
+#include "ToolUserNotesConst.h"
 #include "/EgtDev/Include/EGkGeoPoint3d.h"
 #include "/EgtDev/Include/EGkCurve.h"
 #include "/EgtDev/Include/EGkGeoVector3d.h"
@@ -1061,7 +1062,7 @@ Machining::GetDoubleToolData( string& sDblTool, string& sDblTcPos, string& sDblH
    if ( pTMgr == nullptr)
       return false ;
   // recupero dati utensile in doppio
-   if ( ! GetValInNotes( GetToolData().m_sUserNotes, "DOUBLE", sDblTool))
+   if ( ! GetValInNotes( GetToolData().m_sUserNotes, TUN_DOUBLE, sDblTool))
       return false ;
    if ( ! m_pMchMgr->GetCurrSetupMgr().GetToolData( sDblTool, sDblTcPos, sDblHead, nDblExit)) {
       const ToolData* pTdata = pTMgr->GetTool( sDblTool) ;
diff --git a/OperUserNotesConst.h b/OperUserNotesConst.h
index 1dbe54a..b9634e3 100644
--- a/OperUserNotesConst.h
+++ b/OperUserNotesConst.h
@@ -26,6 +26,7 @@ static const std::string UN_DOUBLE = "DOUBLE" ;
 static const std::string UN_MIRRORAX = "MirrorAx" ;
 static const std::string UN_DELTAZ = "DeltaZ" ;
 static const std::string UN_VTAUXDIR = "VtAuxDir" ;
+static const std::string UN_STARTZMAX = "StartZmax" ;
 
 // Solo per Drilling
 static const std::string UN_LASTSTEP = "LastStep" ;
diff --git a/Operation.cpp b/Operation.cpp
index 5ac8f51..c17c633 100644
--- a/Operation.cpp
+++ b/Operation.cpp
@@ -5297,7 +5297,7 @@ Operation::GetUserNotesZmax( void) const
    string sUserNotes ;
    if ( m_pMchMgr != nullptr  &&  m_pMchMgr->GetMachiningParam( MPA_USERNOTES, sUserNotes)) {
       int nVal ;
-      if ( FromString( ExtractInfo( sUserNotes, "StartZmax="), nVal))
+      if ( GetValInNotes( sUserNotes, UN_STARTZMAX, nVal))
          return nVal ;
    }
    return 0 ;
diff --git a/ToolUserNotesConst.h b/ToolUserNotesConst.h
new file mode 100644
index 0000000..5574444
--- /dev/null
+++ b/ToolUserNotesConst.h
@@ -0,0 +1,22 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2026-2026
+//----------------------------------------------------------------------------
+// File : ToolUserNotesConst.h           Data : 09.04.26        Versione : 3.1d3
+// Contenuto : Costanti per le note utente degli utensili.      
+//
+//
+//
+// Modifiche : 10.11.25 DS Creazione modulo.
+//
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include <string>
+
+//----------------------------------------------------------------------------
+// Generali
+static const std::string TUN_TH = "TH" ;
+static const std::string TUN_DOUBLE = "DOUBLE" ;