Merge branch 'master' of github-as-renaud:obiwankennedy/DiceParser

1 files changed, 36 insertions, 1 deletions

diff --git a/booleancondition.cpp b/booleancondition.cpp
index 49e055a..267d7e9 100644
--- a/booleancondition.cpp
+++ b/booleancondition.cpp
@@ -77,5 +77,40 @@ void BooleanCondition::setValue(qint64 v)
 }
 QString BooleanCondition::toString()
 {
-    return QString("BooleanCondition_op_%1_value_%2").arg(m_operator).arg(m_value);
+    QString str="";
+    switch (m_operator)
+    {
+    case Equal:
+        str.append("=");
+        break;
+    case GreaterThan:
+        str.append(">");
+        break;
+    case LesserThan:
+        str.append("<");
+        break;
+    case GreaterOrEqual:
+        str.append(">=");
+        break;
+    case LesserOrEqual:
+        str.append("<=");
+        break;
+    }
+    return QString("[%1%2]").arg(str).arg(m_value);
+}
+quint8 BooleanCondition::getValidRangeSize(quint64 faces) const
+{
+    switch (m_operator)
+    {
+    case Equal:
+        return 1;
+    case GreaterThan:
+        return faces-m_value;
+    case LesserThan:
+        return m_value-1;
+    case GreaterOrEqual:
+        return faces-(m_value-1);
+    case LesserOrEqual:
+        return m_value;
+    }
 }