diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index e0a455d..6501df7 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index cf302b8..89c2fe4 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -154,6 +154,7 @@ class MachMgr : public IMachMgr bool MdbRemoveMachining( const std::string& sName) override ; bool MdbGetFirstMachining( int nType, std::string& sName) const override ; bool MdbGetNextMachining( int nType, std::string& sName) const override ; + bool MdbGetMachiningFromUUID( const std::string& sMuuid, std::string& sName) const override ; bool MdbSetCurrMachining( const std::string& sName) override ; bool MdbSaveCurrMachining( void) override ; bool MdbIsCurrMachiningModified( void) const override ; diff --git a/MachMgrDBMachinings.cpp b/MachMgrDBMachinings.cpp index 24ebc1f..78c4db7 100644 --- a/MachMgrDBMachinings.cpp +++ b/MachMgrDBMachinings.cpp @@ -90,6 +90,27 @@ MachMgr::MdbGetNextMachining( int nType, string& sName) const return pMsMgr->GetNextMachining( nType, sName) ; } +//---------------------------------------------------------------------------- +bool +MachMgr::MdbGetMachiningFromUUID( const string& sMuuid, string& sName) const +{ + // pulisco il parametro di ritorno + sName.clear() ; + // recupero il gestore di lavorazioni della macchina corrente + MachiningsMgr* pMsMgr = GetCurrMachiningsMgr() ; + if ( pMsMgr == nullptr) + return false ; + // cerco la lavorazione con l'UUID, se trovata ne restituisco il nome + EgtUUID Muuid ; + if ( ! FromString( sMuuid, Muuid)) + return false ; + const MachiningData* pMdata = pMsMgr->GetMachining( Muuid) ; + if ( pMdata == nullptr) + return false ; + sName = pMdata->m_sName ; + return true ; +} + //---------------------------------------------------------------------------- bool MachMgr::MdbSetCurrMachining( const string& sName)