From 9d611b80a8c0a66210f6ed7a0f1fc6c63816202d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 19 Feb 2026 10:02:17 +0100
Subject: [PATCH] EgtExecutor 3.1b1 : - correzioni a recupero nome da nota
 NcName di Gruppo di Lavoro per generazione e stima.

---
 EXE_MachMgr.cpp |  12 ++++++++----
 EgtExecutor.rc  | Bin 19652 -> 19652 bytes
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 7ef0287..86337f3 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -3272,12 +3272,14 @@ ExeGenerate( const string& sCncFile, const string& sInfo)
       ReplaceString( sDir, "/", "\\") ;
      // recupero il nome
       string sNcName ;
-      if ( ! ExeGetInfo( ExeGetCurrMachGroup(), GDL_NC_NAME, sNcName)) {
+      if ( ExeGetInfo( ExeGetCurrMachGroup(), GDL_NC_NAME, sNcName))
+         sNcName = GetFileName( sNcName) ;
+      else {
          string sCurrMachDir ; pMachMgr->GetCurrMachineDir( sCurrMachDir) ;
          string sCurrMachName ; pMachMgr->GetCurrMachineName( sCurrMachName) ;
          string sCurrMachIni = sCurrMachDir + "\\" + sCurrMachName + ".ini" ;
          string sExt = GetPrivateProfileStringUtf8( "PartProgram", "Extension", ".cnc", sCurrMachIni.c_str()) ;
-         sNcName = ChangeFileExtension( GetFileTitleEgt( sProjPath), sExt) ;
+         sNcName = ChangeFileExtension( GetFileName( sProjPath), sExt) ;
       }
      // creo la path completa
       sMyCncFile = sDir + "\\" + sNcName ;
@@ -3304,8 +3306,10 @@ ExeEstimate( const string& sEstFile, const string& sInfo)
       ReplaceString( sDir, "/", "\\") ;
      // recupero il nome
       string sEstName ;
-      if ( ! ExeGetInfo( ExeGetCurrMachGroup(), GDL_NC_NAME, sEstName))
-         sEstName = GetFileTitleEgt( sProjPath) ;
+      if ( ExeGetInfo( ExeGetCurrMachGroup(), GDL_NC_NAME, sEstName))
+         sEstName = GetFileName( sEstName) ;
+      else
+         sEstName = GetFileName( sProjPath) ;
       sEstName = ChangeFileExtension( sEstName, ".html") ;
      // creo la path completa
       sMyEstFile = sDir + "\\" + sEstName ;
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index f9952db49c1a3ea3d9ba0c5db95caa245b031329..2906d677eb77995917016ea791254dc899231ff8 100644
GIT binary patch
delta 276
zcmX>ylkvz*#trM3wOtwV7}6PX7%~}(88R3Y7&I6{fg+g<B@C$yDL{TOkd+AL6;D3z
zDZTjvGZQnb5rYnc;pXpb&dkh742F{(1$8%Pah0*a#g8*hUL#lmlbf8yWwyCX$O0yR
zTntH{l@zMJ8bwrnQA!+2Bs%ioWIfeIli#=s@PfSK3HCq^LnX-hlRq$LZJy+&!;C7m
J`Ml>>CICZGNJ{_!

delta 249
zcmX>ylkvz*#trM3)jb*V7}6PX7*ZLEfmne-gCUrqgdq`#Gl9HNpll|HJz3DLb#olc
z3?^1X1|0^I&A-{4nVA!T3`efTEO4>oOp`YVR)EAOJ8~s&?h~?r$(<I1suz?(Ro|e9
uP#>qnp+u~MHcxaZW)#c^yVw)#;vAq$6E_RGZDht2o;=az;N}TlCQJZ>q&;{5