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.

---
 compositevalidator.cpp | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'compositevalidator.cpp')

diff --git a/compositevalidator.cpp b/compositevalidator.cpp
index 56dc136..7e003a4 100644
--- a/compositevalidator.cpp
+++ b/compositevalidator.cpp
@@ -104,31 +104,18 @@ QString CompositeValidator::toString()
     return QString("[%1%2]").arg(str).arg(m_value);*/
     return str;
 }
-quint64 CompositeValidator::getValidRangeSize(quint64 faces) const
+bool CompositeValidator::isValidRangeSize(std::pair<qint64,qint64> range) const
 {
-    quint64 sum =0;
+    bool val = true;
     int i = -1;
     for(Validator* tmp :*m_validatorList)
     {
-        quint64 rel = tmp->getValidRangeSize(faces);
-        LogicOperation opt = NONE;
-        if(i>=0)
-        {
-            opt = m_operators->at(i);
-        }
-        if(opt == OR)
-        {
-            sum += rel;
-        }
-        else if((opt == AND)&&(opt == EXCLUSIVE_OR))
-        {
-            sum = qMax(rel,sum);
-        }
-
+        quint64 rel = tmp->isValidRangeSize(range);
+        val |= rel;
         ++i;
     }
 
-    return sum;
+    return val;
 }
 void CompositeValidator::setOperationList(QVector<LogicOperation>* m)
 {
-- 
cgit v1.2.3-70-g09d2