From 3a71fac1ee06c4f890a5d6a80ba9e4429e4e1f34 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 25 May 2014 17:02:55 -0400 Subject: [PATCH] Task - Added Eval sources. --- src/Task.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Task.cpp b/src/Task.cpp index d5d44c941..08a9a6950 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -24,7 +24,6 @@ // //////////////////////////////////////////////////////////////////////////////// -//#include #include #include #include @@ -56,10 +55,13 @@ #include #include #include +#include +#include #define APPROACHING_INFINITY 1000 // Close enough. This isn't rocket surgery. extern Context context; +extern Task& contextTask; static const float epsilon = 0.000001; #endif @@ -2225,7 +2227,9 @@ void Task::modify (modType type) else if (column->type () == "date") { Eval e; - // TODO add sources. + e.addSource (domSource); + e.addSource (namedDates); + contextTask = *this; Variant v; e.evaluateInfixExpression (value, v); @@ -2244,7 +2248,9 @@ void Task::modify (modType type) // TODO Store the raw value, for 'recur', else result. Eval e; - // TODO add sources. + e.addSource (domSource); + e.addSource (namedDates); + contextTask = *this; Variant v; e.evaluateInfixExpression (value, v); @@ -2257,7 +2263,9 @@ void Task::modify (modType type) else if (column->type () == "numeric") { Eval e; - // TODO add sources. + e.addSource (domSource); + e.addSource (namedDates); + contextTask = *this; Variant v; e.evaluateInfixExpression (value, v);