This commit is contained in:
Birunthan Mohanathas 2012-06-27 14:49:52 +03:00
parent b07d9131ef
commit 3b8ab1e6e8
3 changed files with 3 additions and 17 deletions

View File

@ -41,7 +41,9 @@ public:
~CConfigParser(); ~CConfigParser();
void Initialize(const std::wstring& filename, CMeterWindow* meterWindow = NULL, LPCTSTR skinSection = NULL, const std::wstring* resourcePath = NULL); void Initialize(const std::wstring& filename, CMeterWindow* meterWindow = NULL, LPCTSTR skinSection = NULL, const std::wstring* resourcePath = NULL);
void AddMeasure(CMeasure* pMeasure); void AddMeasure(CMeasure* pMeasure);
CMeasure* GetMeasure(const std::wstring& name);
bool GetVariable(const std::wstring& strVariable, std::wstring& strValue); bool GetVariable(const std::wstring& strVariable, std::wstring& strValue);
void SetVariable(const std::wstring& strVariable, const std::wstring& strValue) { SetVariable(m_Variables, strVariable, strValue); } void SetVariable(const std::wstring& strVariable, const std::wstring& strValue) { SetVariable(m_Variables, strVariable, strValue); }
@ -104,8 +106,6 @@ private:
void ReadVariables(); void ReadVariables();
CMeasure* GetMeasure(const std::wstring& name);
void ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection = NULL, int depth = 0); void ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection = NULL, int depth = 0);
void SetAutoSelectedMonitorVariables(CMeterWindow* meterWindow); void SetAutoSelectedMonitorVariables(CMeterWindow* meterWindow);

View File

@ -4728,17 +4728,3 @@ CMeter* CMeterWindow::GetMeter(const std::wstring& meterName)
} }
return NULL; return NULL;
} }
CMeasure* CMeterWindow::GetMeasure(const std::wstring& measureName)
{
const WCHAR* name = measureName.c_str();
std::list<CMeasure*>::const_iterator i = m_Measures.begin();
for ( ; i != m_Measures.end(); ++i)
{
if (_wcsicmp((*i)->GetName(), name) == 0)
{
return (*i);
}
}
return NULL;
}

View File

@ -245,7 +245,7 @@ public:
Gdiplus::PrivateFontCollection* GetPrivateFontCollection() { return m_FontCollection; } Gdiplus::PrivateFontCollection* GetPrivateFontCollection() { return m_FontCollection; }
CMeter* GetMeter(const std::wstring& meterName); CMeter* GetMeter(const std::wstring& meterName);
CMeasure* GetMeasure(const std::wstring& measureName); CMeasure* GetMeasure(const std::wstring& measureName) { return m_Parser.GetMeasure(measureName); }
friend class CDialogManage; friend class CDialogManage;