diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index d58af95c..fa408595 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -114,6 +114,7 @@ Use + Use @@ -306,6 +307,7 @@ + diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters index 4a47f323..05dbb45e 100644 --- a/Library/Library.vcxproj.filters +++ b/Library/Library.vcxproj.filters @@ -396,6 +396,9 @@ Source Files + + Source Files + @@ -677,6 +680,9 @@ Header Files + + Header Files + diff --git a/Library/Measure.cpp b/Library/Measure.cpp index 8315f72d..fb615314 100644 --- a/Library/Measure.cpp +++ b/Library/Measure.cpp @@ -29,6 +29,7 @@ #include "MeasureUptime.h" #include "MeasurePlugin.h" #include "MeasureRegistry.h" +#include "MeasureString.h" #include "MeasureTime.h" #include "MeasureCalc.h" #include "MeasureScript.h" @@ -795,6 +796,10 @@ Measure* Measure::Create(const WCHAR* measure, MeterWindow* meterWindow, const W { return new MeasureScript(meterWindow, name); } + else if (_wcsicmp(L"String", measure) == 0) + { + return new MeasureString(meterWindow, name); + } LogErrorF(meterWindow, L"Measure=%s is not valid in [%s]", measure, name); diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp index 2e4b56bf..4912b977 100644 --- a/Library/MeasureCalc.cpp +++ b/Library/MeasureCalc.cpp @@ -96,12 +96,8 @@ void MeasureCalc::ReadOptions(ConfigParser& parser, const WCHAR* section) m_UpdateRandom = parser.ReadBool(section, L"UpdateRandom", false); const size_t range = (m_HighBound - m_LowBound) + 1; - m_UniqueRandom = parser.ReadBool(section, L"UniqueRandom", false); - if (m_UniqueRandom && range > DEFAULT_UNIQUELIMIT) - { - m_UniqueRandom = false; - } - else if (!m_UniqueRandom) + m_UniqueRandom = (range <= DEFAULT_UNIQUELIMIT) && parser.ReadBool(section, L"UniqueRandom", false); + if (!m_UniqueRandom) { m_UniqueNumbers.clear(); }