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

Allow isRun in Filter

Browse Source 
.. isRun is a bool, so isRun = 0 or isRun = 1
   will filter for runs.

.. note isRun does more than just look at sport
   it also checks if there are running data series
   in the file and may extend to more over time
This commit is contained in:
Mark Liversedge
2014-09-26 14:33:26 +01:00
parent 0a90063bd9
commit 27f23fe4f9
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/DataFilter.cpp
View File

@@ -92,7 +92,13 @@ bool Leaf::isNumber(DataFilter *df, Leaf *leaf)
case Leaf::Float : return true;
case Leaf::Integer : return true;
case Leaf::String : return false;
case Leaf::Symbol : return df->lookupType.value(*(leaf->lvalue.n), false);
case Leaf::Symbol :
{
QString symbol = *(leaf->lvalue.n);
if (symbol == "isRun") return true;
else return df->lookupType.value(symbol, false);
}
break;
case Leaf::Logical : return true; // not possible!
case Leaf::Operation : return true;
case Leaf::BinaryOperation : return true;
@@ -136,9 +142,13 @@ void Leaf::validateFilter(DataFilter *df, Leaf *leaf)
// if so set the type to meta or metric
// and save the technical name used to do
// a lookup at execution time
QString lookup = df->lookupMap.value(*(leaf->lvalue.n), "");
QString symbol = *(leaf->lvalue.n);
QString lookup = df->lookupMap.value(symbol, "");
if (lookup == "") {
DataFiltererrors << QString(QObject::tr("%1 is unknown")).arg(*(leaf->lvalue.n));
// isRun isa special, we may add more later (e.g. date)
if (symbol != "isRun")
DataFiltererrors << QString(QObject::tr("%1 is unknown")).arg(symbol);
}
}
break;
@@ -390,9 +400,15 @@ double Leaf::eval(DataFilter *df, Leaf *leaf, SummaryMetrics m, QString f)
case Leaf::Symbol :
{
QString rename;
// get symbol value
if ((lhsisNumber = df->lookupType.value(*(leaf->lvalue.l->lvalue.n))) == true) {
QString symbol = *(leaf->lvalue.l->lvalue.n);
// is it isRun ?
if (symbol == "isRun") {
lhsdouble = m.isRun() ? 1 : 0;
lhsisNumber = true;
} else if ((lhsisNumber = df->lookupType.value(*(leaf->lvalue.l->lvalue.n))) == true) {
// get symbol value
// check metadata string to number first ...
QString meta = m.getText(rename=df->lookupMap.value(*(leaf->lvalue.l->lvalue.n),""), "unknown");
if (meta == "unknown")
@@ -440,8 +456,16 @@ double Leaf::eval(DataFilter *df, Leaf *leaf, SummaryMetrics m, QString f)
case Leaf::Symbol :
{
QString rename;
QString symbol = *(leaf->rvalue.l->lvalue.n);
// is it isRun ?
if (symbol == "isRun") {
rhsdouble = m.isRun() ? 1 : 0;
rhsisNumber = true;
// get symbol value
if ((rhsisNumber=df->lookupType.value(*(leaf->rvalue.l->lvalue.n))) == true) {
} else if ((rhsisNumber=df->lookupType.value(*(leaf->rvalue.l->lvalue.n))) == true) {
// numeric
QString meta = m.getText(rename=df->lookupMap.value(*(leaf->rvalue.l->lvalue.n),""), "unknown");
if (meta == "unknown")