From 23900ee4a93c79451425864f2743a856d57461b9 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 18 Mar 2018 17:40:47 +0100 Subject: -Add node as parameter of condition --- booleancondition.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'booleancondition.h') diff --git a/booleancondition.h b/booleancondition.h index 86dad72..b7282ad 100644 --- a/booleancondition.h +++ b/booleancondition.h @@ -24,6 +24,7 @@ #include #include "validator.h" +#include "node/executionnode.h" /** * @brief The BooleanCondition class is a Validator class checking validity from logic expression. * It manages many operators (see : @ref LogicOperator). @@ -33,11 +34,12 @@ class BooleanCondition : public Validator public: enum LogicOperator { Equal, GreaterThan, LesserThan, GreaterOrEqual, LesserOrEqual, Different}; BooleanCondition(); + virtual ~BooleanCondition(); virtual qint64 hasValid(Die* b,bool recursive, bool unhighlight = false) const; void setOperator(LogicOperator m); - void setValue(qint64); + void setValueNode(ExecutionNode*); QString toString(); virtual quint64 getValidRangeSize(quint64 faces) const; @@ -46,10 +48,11 @@ public: * @return */ virtual Validator* getCopy() const; - +private: + qint64 valueToScalar() const; private: LogicOperator m_operator; - qint64 m_value; + ExecutionNode* m_value; }; #endif // BOOLEANCONDITION_H -- cgit v1.2.3-70-g09d2