EgtExecutor 3.1b1 :

- correzioni a recupero nome da nota NcName di Gruppo di Lavoro per generazione e stima.

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 ;