diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 5e0760e..3e700b7 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index e8ba2a8..4ff70ab 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -84,6 +84,7 @@ class MachMgr : public IMachMgr int AddMachGroup( const std::string& sName, const std::string& sMachineName) override ; bool RemoveMachGroup( int nId) override ; std::string GetMachGroupName( int nId) const override ; + std::string GetMachGroupMachineName( int nId) const override ; int GetMachGroupId( const std::string& sName) const override ; bool SetCurrMachGroup( int nId) override ; bool ResetCurrMachGroup( void) override ; diff --git a/MachMgrMachGroups.cpp b/MachMgrMachGroups.cpp index 9875dce..eb04944 100644 --- a/MachMgrMachGroups.cpp +++ b/MachMgrMachGroups.cpp @@ -241,6 +241,22 @@ MachMgr::GetMachGroupName( int nId) const return sName ; } +//---------------------------------------------------------------------------- +string +MachMgr::GetMachGroupMachineName( int nId) const +{ + // verifica del gruppo base per le lavorazioni + if ( ! VerifyMachBase()) + return "" ; + // verifico che il gruppo ricevuto sia corretto + if ( m_pGeomDB->GetParentId( nId) != m_nMachBaseId) + return "" ; + // recupero il nome della macchina del gruppo riferito + string sName ; + m_pGeomDB->GetInfo( nId, MACH_MACHINE_KEY, sName) ; + return sName ; +} + //---------------------------------------------------------------------------- int MachMgr::GetMachGroupId( const string& sName) const