From 237043352d1967f5192166b5fdeb913edf75dd64 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Tue, 10 Aug 2010 15:37:35 +0000
Subject: [PATCH] Fixed issue that Counter in Measure=Calc is case-sensitive.
 Added MeasureName2 as an alternative to SecondaryMeasureName in
 Meter=Histogram.

---
 Library/MeasureCalc.cpp    | 16 +++++++++++-----
 Library/MeasureCalc.h      |  2 +-
 Library/MeterHistogram.cpp |  6 +++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp
index e3023d0a..a5ad5c38 100644
--- a/Library/MeasureCalc.cpp
+++ b/Library/MeasureCalc.cpp
@@ -76,7 +76,7 @@ bool CMeasureCalc::Update()
 	m_Parser->Parameters = c_VarMap;
 	if(m_UpdateRandom > 0)
 	{
-		RandomFormulaReplace();
+		FormulaReplace();
 	}
 
 	char* errMsg = MathParser_Parse(m_Parser, ConvertToAscii(m_Formula.c_str()).c_str(), &m_Value);
@@ -134,23 +134,24 @@ void CMeasureCalc::ReadConfig(CConfigParser& parser, const WCHAR* section)
 	m_HighBound = parser.ReadInt(section, L"HighBound", 100);
 	m_UpdateRandom = parser.ReadInt(section, L"UpdateRandom", 0);
 
-	RandomFormulaReplace();
+	FormulaReplace();
 }
 
 /*
-** RandomFormulaReplace
+** FormulaReplace
 **
 ** This replaces the word Random in m_Formula with a random number
+** and all cases of counter with Counter
 **
 */
-void CMeasureCalc::RandomFormulaReplace()
+void CMeasureCalc::FormulaReplace()
 {
 	//To implement random numbers the word "Random" in the string
 	//formula is being replaced by the random number value
 	m_Formula = m_FormulaHolder;
 	std::wstring::size_type loc = 0;
 
-	while ((loc = m_Formula.find_first_of(L"Rr", loc)) != std::wstring::npos)
+	while ((loc = m_Formula.find_first_of(L"RrCc", loc)) != std::wstring::npos)
 	{
 		if (wcsnicmp(L"Random", m_Formula.c_str() + loc, 6) == 0)
 		{
@@ -164,6 +165,11 @@ void CMeasureCalc::RandomFormulaReplace()
 			m_Formula.replace(loc, 6, buffer);
 			loc += wcslen(buffer);
 		}
+		else if (wcsnicmp(L"Counter", m_Formula.c_str() + loc, 7) == 0)
+		{
+			m_Formula.replace(loc, 7, L"Counter");
+			loc += 7;
+		}
 		else
 		{
 			++loc;
diff --git a/Library/MeasureCalc.h b/Library/MeasureCalc.h
index 4735bfb1..eaa9a8f4 100644
--- a/Library/MeasureCalc.h
+++ b/Library/MeasureCalc.h
@@ -34,7 +34,7 @@ public:
 	static void UpdateVariableMap(CMeterWindow& meterWindow);
 	
 private:
-	void RandomFormulaReplace();
+	void FormulaReplace();
 	std::wstring m_Formula;
 	std::wstring m_FormulaHolder;
 	hqMathParser* m_Parser;
diff --git a/Library/MeterHistogram.cpp b/Library/MeterHistogram.cpp
index d8c8ba21..3fb596bd 100644
--- a/Library/MeterHistogram.cpp
+++ b/Library/MeterHistogram.cpp
@@ -258,7 +258,11 @@ void CMeterHistogram::ReadConfig(const WCHAR* section)
 	m_SecondaryColor = parser.ReadColor(section, L"SecondaryColor", Color::Red);
 	m_BothColor = parser.ReadColor(section, L"BothColor", Color::Yellow);
 
-	m_SecondaryMeasureName = parser.ReadString(section, L"SecondaryMeasureName", L"");
+	m_SecondaryMeasureName = parser.ReadString(section, L"MeasureName2", L"");
+	if (m_SecondaryMeasureName == L"")
+	{
+		m_SecondaryMeasureName = parser.ReadString(section, L"SecondaryMeasureName", L"");
+	}
 
 	m_PrimaryImageName = parser.ReadString(section, L"PrimaryImage", L"");
 	m_PrimaryImageName = m_MeterWindow->MakePathAbsolute(m_PrimaryImageName);