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

Move MathParser to Common

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-06-13 17:00:24 +03:00
parent 3cebbc6b53
commit be3efa7531
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Library/MeasureCalc.cpp
View File

@ -17,9 +17,9 @@
*/
#include "StdAfx.h"
#include "../Common/MathParser.h"
#include "MeasureCalc.h"
#include "Rainmeter.h"
#include "MathParser.h"
bool MeasureCalc::c_RandSeeded = false;
@ -56,7 +56,7 @@ MeasureCalc::~MeasureCalc()
*/
void MeasureCalc::UpdateValue()
{
const WCHAR* errMsg = MathParser::Parse(m_Formula.c_str(), this, &m_Value);
const WCHAR* errMsg = MathParser::Parse(m_Formula.c_str(), &m_Value, GetMeasureValue, this);
if (errMsg != nullptr)
{
if (!m_ParseError)
@ -145,9 +145,10 @@ void MeasureCalc::FormulaReplace()
while (pos != std::wstring::npos);
}
bool MeasureCalc::GetMeasureValue(const WCHAR* str, int len, double* value)
bool MeasureCalc::GetMeasureValue(const WCHAR* str, int len, double* value, void* context)
{
const std::vector<Measure*>& measures = m_MeterWindow->GetMeasures();
auto calc = (MeasureCalc*)context;
const std::vector<Measure*>& measures = calc->m_MeterWindow->GetMeasures();
std::vector<Measure*>::const_iterator iter = measures.begin();
for ( ; iter != measures.end(); ++iter)
@ -162,12 +163,12 @@ bool MeasureCalc::GetMeasureValue(const WCHAR* str, int len, double* value)
if (_wcsnicmp(str, L"counter", len) == 0)
{
*value = m_MeterWindow->GetUpdateCounter();
*value = calc->m_MeterWindow->GetUpdateCounter();
return true;
}
else if (_wcsnicmp(str, L"random", len) == 0)
{
*value = GetRandom();
*value = calc->GetRandom();
return true;
}