From 4c884e8ee590e2eb85eb54a375354beb404d4b6b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 20 Sep 2016 09:18:39 +0000 Subject: [PATCH] EgtMachKernel 1.6u2 : - aggiunta funzione MdbGetMachiningFromUUID. --- EgtMachKernel.rc | Bin 11782 -> 11782 bytes MachMgr.h | 1 + MachMgrDBMachinings.cpp | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index e0a455deac9f9b2c9c3054f1830c9b77bdd005a7..6501df735e87ab04d4dc749e1aa4436b87769a9c 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFx_^ItYwW=5mQj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHP01iS delta 97 zcmZpRX^YwLhmFy2^ItYwW=6xwj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHOf?`f 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)