From 64e9988ba715e6e196b84e4a69c871c761562bbd Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Mon, 27 Aug 2018 01:03:08 +0200
Subject: -New API for validating validor. Prevent endless loop in R operator.

---
 booleancondition.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'booleancondition.cpp')

diff --git a/booleancondition.cpp b/booleancondition.cpp
index 18e4305..8781039 100644
--- a/booleancondition.cpp
+++ b/booleancondition.cpp
@@ -119,24 +119,33 @@ QString BooleanCondition::toString()
     }
     return QStringLiteral("[%1%2]").arg(str).arg(valueToScalar());
 }
-quint64 BooleanCondition::getValidRangeSize(quint64 faces) const
+bool BooleanCondition::isValidRangeSize(std::pair<qint64, qint64> range) const
 {
+    bool isValid = false;
+    auto valueScalar = valueToScalar();
+    qint64 boundValue = qBound(range.first,valueScalar,range.second);
     switch(m_operator)
     {
     case Equal:
-        return 1;
+        isValid = (boundValue == valueScalar);
+        break;
     case GreaterThan:
-        return faces - valueToScalar();
+        isValid = range.first<=valueScalar;
+        break;
     case LesserThan:
-        return valueToScalar() - 1;
+        isValid = range.second>=valueScalar;
+        break;
     case GreaterOrEqual:
-        return faces - (valueToScalar() - 1);
+        isValid = range.first<valueScalar;
+        break;
     case LesserOrEqual:
-        return valueToScalar();
+        isValid = range.second>valueScalar;
+        break;
     case Different:
-        return faces - 1;
+        isValid = (boundValue == valueScalar);
+        break;
     }
-    return 0;
+    return isValid;
 }
 Validator* BooleanCondition::getCopy() const
 {
-- 
cgit v1.2.3-70-g09d2