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, 39 insertions, 32 deletions

diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index ff3d67b..55b278e 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -6,11 +6,11 @@
 CountExecuteNode::CountExecuteNode()
 	: m_scalarResult(new ScalarResult()),m_validator(NULL)
 {
-    m_result = m_scalarResult;
+	m_result = m_scalarResult;
 }
 void CountExecuteNode::setValidator(Validator* validator)
 {
-    m_validator = validator;
+	m_validator = validator;
 }
 CountExecuteNode::~CountExecuteNode()
 {
@@ -23,41 +23,48 @@ CountExecuteNode::~CountExecuteNode()
 void CountExecuteNode::run(ExecutionNode *previous)
 {
 	m_previousNode = previous;
-    if(NULL==previous)
-    {
-        return;
-    }
-    DiceResult* previous_result = dynamic_cast<DiceResult*>(previous->getResult());
-    if(NULL!=previous_result)
-    {
-        m_result->setPrevious(previous_result);
-        QList<Die*> diceList=previous_result->getResultList();
-        qint64 sum = 0;
-        foreach(Die* dice,diceList)
-        {
-            sum+=m_validator->hasValid(dice,true,true);
-        }
-        m_scalarResult->setValue(sum);
-
-
-        if(NULL!=m_nextNode)
-        {
-            m_nextNode->run(this);
-        }
-    }
+	if(NULL==previous)
+	{
+		return;
+	}
+	DiceResult* previous_result = dynamic_cast<DiceResult*>(previous->getResult());
+	if(NULL!=previous_result)
+	{
+		m_result->setPrevious(previous_result);
+		QList<Die*> diceList=previous_result->getResultList();
+		qint64 sum = 0;
+		foreach(Die* dice,diceList)
+		{
+			sum+=m_validator->hasValid(dice,true,true);
+		}
+		m_scalarResult->setValue(sum);
+
+
+		if(NULL!=m_nextNode)
+		{
+			m_nextNode->run(this);
+		}
+	}
 }
-QString CountExecuteNode::toString() const
+QString CountExecuteNode::toString(bool withlabel) const
 {
-    return "CountExecuteNode"+m_validator->toString();
+	if(withlabel)
+	{
+		return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id).arg(m_validator->toString());
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 CountExecuteNode::getPriority() const
 {
-    qint64 priority=0;
-    if(NULL!=m_nextNode)
-    {
-        priority = m_nextNode->getPriority();
-    }
+	qint64 priority=0;
+	if(NULL!=m_nextNode)
+	{
+		priority = m_nextNode->getPriority();
+	}
 
 
-    return priority;
+	return priority;
 }