nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

DataFilter NOT (!) Operator

Browse Source 
.. to negate a condition e.g. !Sport = "Run"
This commit is contained in:
Mark Liversedge
2015-12-04 13:50:59 +00:00
parent 30d1127b4e
commit 1dea64f53d
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/DataFilter.cpp
View File

@@ -1084,8 +1084,8 @@ void Leaf::validateFilter(DataFilter *df, Leaf *leaf)
break;
case Leaf::UnaryOperation :
{ // only 1 at present, unary minus return the value * -1
if (!Leaf::isNumber(df, leaf->lvalue.l)) {
{ // unary minus needs a number, unary ! is happy with anything
if (leaf->op == '-' && !Leaf::isNumber(df, leaf->lvalue.l)) {
DataFiltererrors << QString(tr("unary negation on a string!"));
leaf->inerror = true;
}
@@ -2087,7 +2087,15 @@ Result Leaf::eval(Context *context, DataFilter *df, Leaf *leaf, float x, RideIte
{
// get result
Result lhs = eval(context, df, leaf->lvalue.l, x, m, p);
return Result(lhs.number * -1);
// unary minus
if (leaf->op == '-') return Result(lhs.number * -1);
// unary not
if (leaf->op == '!') return Result(!lhs.number);
// unknown
return(Result(0));
}
break;