From 823d97938e020a502c8ab27ca7d985a7cd539b21 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 6 Feb 2017 10:16:54 +0000
Subject: [PATCH] EgtMachKernel 1.8b2 : - aggiunta funzione di interfaccia
 GetDefaultSetupName.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 MachMgr.h        |   1 +
 MachMgrSetup.cpp |  30 ++++++++++++++++++++++++------
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 7657fa47330a99c7dc4ddc9d294a3cbf91280e92..530556c6b010ed8c4faab7b18bad1f1c7e47a1c5 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/MachMgr.h b/MachMgr.h
index ef0bb46..f9b619b 100644
--- a/MachMgr.h
+++ b/MachMgr.h
@@ -163,6 +163,7 @@ class MachMgr : public IMachMgr
       bool TdbGetToolHolderDir( std::string& sTHolderDir) const override ;
      // Setup
       int  GetCurrSetup( void) const override ;
+      bool GetDefaultSetupName( std::string& sName) const override ;
       bool ImportSetup( const std::string& sName) override ;
      // Machinings DataBase
       bool MdbGetMachiningNewName( std::string& sName) const override ;
diff --git a/MachMgrSetup.cpp b/MachMgrSetup.cpp
index bdcc836..bffbc0d 100644
--- a/MachMgrSetup.cpp
+++ b/MachMgrSetup.cpp
@@ -26,6 +26,26 @@ MachMgr::GetCurrSetup( void) const
    return GetCurrSetupGroupId() ;
 }
 
+//----------------------------------------------------------------------------
+bool
+MachMgr::GetDefaultSetupName( string& sName) const
+{
+  // verifico esista macchina corrente
+   Machine* pMch = GetCurrMachine() ;
+   if ( pMch == nullptr)
+      return false ;
+  // recupero da file Ini della macchina
+   //string sMachIni = m_sMachinesDir + "\\" + GetCurrMGeoName() + "\\" + GetCurrMGeoName() + ".ini" ;
+   string sMachIni = pMch->GetMachineDir() + "\\" + pMch->GetMachineName() + ".ini" ;
+   string sDefault = GetPrivateProfileStringUtf8( SETUP_SEC.c_str(), SETUP_DEF_KEY.c_str(), "", sMachIni.c_str()) ;
+  // se non trovato, errore
+   if ( IsEmptyOrSpaces( sDefault))
+      return false ;
+  // assegno il nome
+   sName = sDefault ;
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 MachMgr::ImportSetup( const string& sName)
@@ -38,12 +58,10 @@ MachMgr::ImportSetup( const string& sName)
    }
   // altrimenti cerco default
    else {
-      string sMachIni = m_sMachinesDir + "\\" + GetCurrMGeoName() + "\\" + GetCurrMGeoName() + ".ini" ;
-      string sDefault = GetPrivateProfileStringUtf8( SETUP_SEC.c_str(), SETUP_DEF_KEY.c_str(), "", sMachIni.c_str()) ;
-      if ( ! IsEmptyOrSpaces( sDefault))
-         sFileName += sDefault + "." + SETUP_EXT ;
-      else
+      string sDefault ;
+      if ( ! GetDefaultSetupName( sDefault))
          return false ;
+      sFileName += sDefault + "." + SETUP_EXT ;
    }
 
   // gestione attrezzaggio
@@ -56,4 +74,4 @@ MachMgr::ImportSetup( const string& sName)
 
   // lo inserisco nel progetto
    return stuMgr.Save() ;
-}
\ No newline at end of file
+}