nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-16 01:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formula const()

Browse Source 
.. for pi and e, we can add more later
   i.e. const(pi) and const(e) return high
   precision values for both
This commit is contained in:
Mark Liversedge
2015-08-15 10:33:09 +01:00
parent 7bc1537f30
commit 58e2c88c9a
5 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/DataFilter.cpp
View File

@@ -243,6 +243,7 @@ void Leaf::validateFilter(DataFilter *df, Leaf *leaf)
QRegExp bestValidSymbols("^(apower|power|hr|cadence|speed|torque|vam|xpower|np|wpk)$", Qt::CaseInsensitive);
QRegExp tizValidSymbols("^(power|hr)$", Qt::CaseInsensitive);
QRegExp configValidSymbols("^(cp|w\\'|pmax|cv|d\\'|scv|sd\\'|height|weight|lthr|maxhr|rhr|units)$", Qt::CaseInsensitive);
QRegExp constValidSymbols("^(e|pi)$", Qt::CaseInsensitive); // just do basics for now
QString symbol = leaf->series->lvalue.n->toLower();
if (leaf->function == "sts" || leaf->function == "lts" || leaf->function == "sb" || leaf->function == "rr") {
@@ -262,6 +263,19 @@ void Leaf::validateFilter(DataFilter *df, Leaf *leaf)
if (leaf->function == "config" && !configValidSymbols.exactMatch(symbol))
DataFiltererrors << QString(QObject::tr("invalid data series for config(): %1")).arg(symbol);
if (leaf->function == "const") {
if (!constValidSymbols.exactMatch(symbol))
DataFiltererrors << QString(QObject::tr("invalid literal for const(): %1")).arg(symbol);
else {
// convert to a float
leaf->type = Leaf::Float;
leaf->lvalue.f = 0.0L;
if (symbol == "e") leaf->lvalue.f = MATHCONST_E;
if (symbol == "pi") leaf->lvalue.f = MATHCONST_PI;
}
}
if (leaf->function == "best" || leaf->function == "tiz") {
// now set the series type used as parameter 1 to best/tiz
leaf->seriesType = nameToSeries(symbol);