Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

Conflicts:
	HelpMe.md
	diceparser.cpp
	parsingtoolbox.cpp
	result/result.cpp
	result/stringresult.h

1 files changed, 69 insertions, 17 deletions

diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp
index fdc17a5..9f15d36 100644
--- a/node/listsetrollnode.cpp
+++ b/node/listsetrollnode.cpp
@@ -22,7 +22,7 @@
 #include "die.h"
 
 ListSetRollNode::ListSetRollNode()
-    :m_diceResult(new DiceResult()),m_stringResult(new StringResult())
+    :m_diceResult(new DiceResult()),m_stringResult(new StringResult()),m_unique(false)
 {
     m_result = m_stringResult;
 }
@@ -39,19 +39,21 @@ QStringList ListSetRollNode::getList()
 {
     return m_values;
 }
-QString ListSetRollNode::toString() const
+QString ListSetRollNode::toString(bool wl) const
 {
-    return QString("ListSetRollNode [label=\"ListSetRoll list:%1\"]").arg(m_values.join(','));
+	if(wl)
+	{
+		return QString("%1 [label=\"ListSetRoll list:%2\"]").arg(m_id).arg(m_values.join(","));
+	}
+	else
+	{
+		return m_id;
+	}
+
 }
 qint64 ListSetRollNode::getPriority() const
 {
     qint64 priority=4;
-//    if(NULL!=m_nextNode)
-//    {
-//        priority = m_nextNode->getPriority();
-//    }
-
-
     return priority;
 }
 void ListSetRollNode::run(ExecutionNode* previous)
@@ -68,13 +70,10 @@ void ListSetRollNode::run(ExecutionNode* previous)
             for(quint64 i=0; i < diceCount ; ++i)
             {
                 Die* die = new Die();
-                die->setFaces(m_values.size());
+                computeFacesNumber(die);
                 die->roll();
                 m_diceResult->insertResult(die);
-                if(die->getValue()-1<m_values.size())
-                {
-                    rollResult << m_values[die->getValue()-1];
-                }
+                getValueFromDie(die,rollResult);
             }
             m_stringResult->setText(rollResult.join(","));
             if(NULL!=m_nextNode)
@@ -83,11 +82,64 @@ void ListSetRollNode::run(ExecutionNode* previous)
             }
         }
     }
-
-
-
 }
 void ListSetRollNode::setListValue(QStringList lirs)
 {
     m_values = lirs;
 }
+void ListSetRollNode::setUnique(bool u)
+{
+    m_unique = u;
+}
+void ListSetRollNode::setRangeList(QList<Range>& ranges)
+{
+    m_rangeList = ranges;
+}
+void ListSetRollNode::computeFacesNumber(Die* die)
+{
+    if(m_rangeList.isEmpty())
+    {
+        die->setFaces(m_values.size());
+    }
+    else
+    {
+        Q_ASSERT(m_values.size() == m_rangeList.size());
+        qint64 max;
+        int i=0;
+        foreach(Range range, m_rangeList)
+        {
+            if(((i==0)||(max<range.getEnd()))&&(range.isFullyDefined()))
+            {
+               // qDebug()<< range.isFullyDefined() << range.getEnd();
+                max= range.getEnd();
+            }
+            ++i;
+        }
+        //qDebug() << "set Faces"<<max;
+        die->setFaces(max);
+    }
+
+}
+void ListSetRollNode::getValueFromDie(Die* die,QStringList& rollResult)
+{
+    if(m_rangeList.isEmpty())
+    {
+        if(die->getValue()-1<m_values.size())
+        {
+            rollResult << m_values[die->getValue()-1];
+        }
+    }
+    else
+    {
+        Q_ASSERT(m_values.size() == m_rangeList.size());
+        int i=0;
+        foreach (Range range, m_rangeList)
+        {
+            if(range.hasValid(die,false))
+            {
+                rollResult << m_values[i];
+            }
+            ++i;
+        }
+    }
+}