chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed a problem that "Random" is case-sensitive in CALC measure.

Browse Source 
Fixed a problem that a deletion of the meter window encounters enormous delays when the meter window has enormous Update=.

Some small cosmetics.
This commit is contained in:
spx
2010-04-08 23:16:43 +00:00
parent 54fe29a062
commit 32db892e2c
5 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Library/MeasureCalc.cpp
View File

@@ -148,20 +148,25 @@ void CMeasureCalc::RandomFormulaReplace()
//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 = m_Formula.find(L"Random");
std::wstring::size_type loc = 0;
while(loc != std::wstring::npos)
while ((loc = m_Formula.find_first_of(L"Rr", loc)) != std::wstring::npos)
{
int range = (m_HighBound - m_LowBound);
srand((unsigned) rand());
int randNumber = m_LowBound + (range * rand()/(RAND_MAX + 1.0));
if (wcsnicmp(L"Random", m_Formula.c_str() + loc, 6) == 0)
{
int range = (m_HighBound - m_LowBound);
srand((unsigned) rand());
int randNumber = m_LowBound + (range * rand()/(RAND_MAX + 1.0));
std::wstring randomNumberString= (L"");
wchar_t buf[8];
_itow(randNumber,buf,10);
randomNumberString.append(buf);
WCHAR buffer[32];
wsprintf(buffer, L"%i", randNumber);
m_Formula.replace(loc, 6, randomNumberString);
loc = m_Formula.find(L"Random");
m_Formula.replace(loc, 6, buffer);
loc += wcslen(buffer);
}
else
{
++loc;
}
}
}