23 files changed, 165 insertions, 83 deletions

diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index 295fdad..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,50 +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==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!=m_nextNode)
+		{
+			m_nextNode->run(this);
+		}
+	}
 }
 QString CountExecuteNode::toString(bool withlabel) const
 {
-if(withlabel)
-{
-    return "CountExecuteNode"+m_validator->toString();
-}
-else
-{
-
-    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;
 }
diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp
index 06148fc..213c8ec 100644
--- a/node/dicerollernode.cpp
+++ b/node/dicerollernode.cpp
@@ -71,9 +71,16 @@ quint64 DiceRollerNode::getFaces()
 {
     return m_faces;
 }
-QString DiceRollerNode::toString() const
+QString DiceRollerNode::toString(bool wl) const
 {
-    return QString("DiceRollerNode");
+	if(wl)
+	{
+		return QString("%1 [label=DiceRollerNode]").arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 DiceRollerNode::getPriority() const
 {
diff --git a/node/dicerollernode.h b/node/dicerollernode.h
index 726676e..402ef40 100644
--- a/node/dicerollernode.h
+++ b/node/dicerollernode.h
@@ -30,7 +30,7 @@ public:
     virtual void run(ExecutionNode*);
     quint64 getFaces();
 
-     virtual QString toString()const;
+	 virtual QString toString(bool wl)const;
      virtual qint64 getPriority() const;
 //private members
 private:
diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index dba56fc..c6f3915 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -1,7 +1,9 @@
 #include "executionnode.h"
 
+#include <QUuid>
+
 ExecutionNode::ExecutionNode()
-    : m_nextNode(NULL),m_result(NULL),m_previousNode(NULL)
+	: m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QUuid::createUuid().toString())
 {
 
 }
diff --git a/node/executionnode.h b/node/executionnode.h
index cca7903..41f2b79 100644
--- a/node/executionnode.h
+++ b/node/executionnode.h
@@ -3,6 +3,7 @@
 
 #include "result/result.h"
 #include <QDebug>
+
 /**
  * @brief The ExecutionNode class
  */
@@ -85,6 +86,8 @@ protected:
      * @brief m_errors
      */
     QMap<ExecutionNode::ERROR_CODE,QString> m_errors;
+
+	QString m_id;
 };
 
 #endif // EXECUTIONNODE_H
diff --git a/node/explosedicenode.cpp b/node/explosedicenode.cpp
index c0ebfe7..cdbeb6c 100644
--- a/node/explosedicenode.cpp
+++ b/node/explosedicenode.cpp
@@ -44,9 +44,16 @@ void ExploseDiceNode::setValidator(Validator* val)
 {
       m_validator = val;
 }
-QString ExploseDiceNode::toString() const
+QString ExploseDiceNode::toString(bool withlabel) const
 {
-    return QString("ExploseDiceNode [label=\"ExploseDiceNode %1\"]").arg(m_validator->toString());
+	if(withlabel)
+	{
+		return QString("%1 [label=\"ExploseDiceNode %2\"]").arg(m_id).arg(m_validator->toString());
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 ExploseDiceNode::getPriority() const
 {
diff --git a/node/explosedicenode.h b/node/explosedicenode.h
index f5d0f6e..65c0abd 100644
--- a/node/explosedicenode.h
+++ b/node/explosedicenode.h
@@ -16,7 +16,7 @@ public:
 	virtual ~ExploseDiceNode();
     virtual void run(ExecutionNode* previous = NULL);
     virtual void setValidator(Validator* );
-    virtual QString toString()const;
+	virtual QString toString(bool )const;
     virtual qint64 getPriority() const;
 
 protected:
diff --git a/node/helpnode.cpp b/node/helpnode.cpp
index 6108e4d..d5fc2c9 100644
--- a/node/helpnode.cpp
+++ b/node/helpnode.cpp
@@ -29,9 +29,16 @@ void HelpNode::run(ExecutionNode* previous)
         m_nextNode->run(this);
     }
 }
-QString HelpNode::toString() const
+QString HelpNode::toString(bool wl) const
 {
-    return QObject::tr("Rolisteam Dice Parser:\nFull documentation at: %1 \n").arg(m_path);
+	if(wl)
+	{
+		return QString("%1 [label=\"Rolisteam Dice Parser:\nFull documentation at: %2\"]").arg(m_id).arg(m_path);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 
 qint64 HelpNode::getPriority() const
diff --git a/node/helpnode.h b/node/helpnode.h
index 88a0842..c492e66 100644
--- a/node/helpnode.h
+++ b/node/helpnode.h
@@ -26,7 +26,7 @@ public:
      * @brief toString
      * @return
      */
-    virtual QString toString()const;
+	virtual QString toString(bool )const;
     /**
      * @brief getPriority
      * @return
diff --git a/node/jumpbackwardnode.cpp b/node/jumpbackwardnode.cpp
index be759ce..b0a5c8e 100644
--- a/node/jumpbackwardnode.cpp
+++ b/node/jumpbackwardnode.cpp
@@ -34,9 +34,16 @@ qint64 JumpBackwardNode::getPriority() const
 {
     return 4;
 }
-QString JumpBackwardNode::toString() const
+QString JumpBackwardNode::toString(bool wl) const
 {
-    return QString("JumpBackwardNode");
+	if(wl)
+	{
+		return QString("%1 [label=\"JumpBackwardNode\"]").arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 void JumpBackwardNode::run(ExecutionNode* previous)
 {
diff --git a/node/jumpbackwardnode.h b/node/jumpbackwardnode.h
index 469c64a..a89d0d3 100644
--- a/node/jumpbackwardnode.h
+++ b/node/jumpbackwardnode.h
@@ -43,7 +43,7 @@ public:
 	 * @brief toString
 	 * @return
 	 */
-	virtual QString toString() const;
+	virtual QString toString(bool) const;
 	/**
 	 * @brief getPriority
 	 * @return
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index a225ac4..492e69c 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -62,9 +62,16 @@ void KeepDiceExecNode::setDiceKeepNumber(quint64 n)
 {
     m_numberOfDice = n;
 }
-QString KeepDiceExecNode::toString() const
+QString KeepDiceExecNode::toString(bool wl) const
 {
-    return QString("KeepDiceExecNode [label=\"KeepDiceExecNode %1\"]").arg(m_numberOfDice);
+	if(wl)
+	{
+		return QString("%1 [label=\"KeepDiceExecNode %1\"]").arg(m_id).arg(m_numberOfDice);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 KeepDiceExecNode::getPriority() const
 {
diff --git a/node/keepdiceexecnode.h b/node/keepdiceexecnode.h
index 01f5028..f86daa5 100644
--- a/node/keepdiceexecnode.h
+++ b/node/keepdiceexecnode.h
@@ -34,7 +34,7 @@ public:
 
     virtual void run(ExecutionNode *previous);
     virtual void setDiceKeepNumber(quint64 );
-    virtual QString toString()const;
+	virtual QString toString(bool)const;
     virtual qint64 getPriority() const;
 private:
     quint64 m_numberOfDice;
diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp
index ddb8ac9..7af202c 100644
--- a/node/listaliasnode.cpp
+++ b/node/listaliasnode.cpp
@@ -58,14 +58,23 @@ QString ListAliasNode::buildList() const
 	}
 	return result;
 }
-QString ListAliasNode::toString() const
+QString ListAliasNode::toString(bool wl) const
 {
-    QStringList resultList;
-    foreach(DiceAlias* key, *m_aliasList)
-    {
-        resultList <<  "{" <<key->getCommand() << key->getValue()<<  "}";
-    }
-    return QString("ListAliasNode [label=\"ListAliasNode %1\"]").arg(resultList.join(","));
+	QStringList resultList;
+	foreach(DiceAlias* key, *m_aliasList)
+	{
+		resultList <<  "{" <<key->getCommand() << key->getValue()<<  "}";
+	}
+
+	if(wl)
+	{
+		return QString("%1 [label=\"ListAliasNode %2\"]").arg(m_id).arg(resultList.join(","));
+	}
+	else
+	{
+		return m_id;
+	}
+
 
 }
 qint64 ListAliasNode::getPriority() const
diff --git a/node/listaliasnode.h b/node/listaliasnode.h
index e8f8b0f..2f83a1b 100644
--- a/node/listaliasnode.h
+++ b/node/listaliasnode.h
@@ -42,7 +42,7 @@ public:
 	 * @brief toString
 	 * @return
 	 */
-    virtual QString toString() const;
+	virtual QString toString(bool) const;
     /**
      * @brief buildList
      * @return
diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp
index ce2f2ac..9f15d36 100644
--- a/node/listsetrollnode.cpp
+++ b/node/listsetrollnode.cpp
@@ -39,9 +39,17 @@ 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
 {
diff --git a/node/numbernode.cpp b/node/numbernode.cpp
index 55ee752..e2da54f 100644
--- a/node/numbernode.cpp
+++ b/node/numbernode.cpp
@@ -48,11 +48,11 @@ QString NumberNode::toString(bool withLabel) const
 {
     if(withLabel)
 	{
-    	return QString("NumberNode%2 [label=\"NumberNode %1\"]").arg(m_number).arg(m_number);
+		return QString("%1 [label=\"NumberNode %2\"]").arg(m_id).arg(m_number);
 	}
 	else
 	{
-		return QString("NumberNode%1").arg(m_number);
+		return m_id;
 	}
 }
 qint64 NumberNode::getPriority() const
diff --git a/node/parenthesesnode.cpp b/node/parenthesesnode.cpp
index 2876147..3398f0a 100644
--- a/node/parenthesesnode.cpp
+++ b/node/parenthesesnode.cpp
@@ -49,9 +49,16 @@ void ParenthesesNode::run(ExecutionNode* /*previous*/)
         m_nextNode->run(this);
     }
 }
-QString ParenthesesNode::toString() const
+QString ParenthesesNode::toString(bool b) const
 {
-    return "ParenthesesNode";
+	if(wl)
+	{
+		return QString("%1 [label=\"ParenthesesNode\"]").arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 ParenthesesNode::getPriority() const
 {
diff --git a/node/parenthesesnode.h b/node/parenthesesnode.h
index 999e7bd..fbb1caf 100644
--- a/node/parenthesesnode.h
+++ b/node/parenthesesnode.h
@@ -34,7 +34,7 @@ public:
     virtual void run(ExecutionNode* previous = NULL);
 
     void setInternelNode(ExecutionNode* node);
-    virtual QString toString()const;
+	virtual QString toString(bool)const;
     virtual qint64 getPriority() const;
 private:
     ExecutionNode* m_internalNode;
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp
index 7798f61..ce8f109 100644
--- a/node/rerolldicenode.cpp
+++ b/node/rerolldicenode.cpp
@@ -48,7 +48,15 @@ void RerollDiceNode::setValidator(Validator* val)
 }
 QString RerollDiceNode::toString(bool wl) const
 {
-    return QString("RerollDiceNode [label=\"RerollDiceNode validatior:%1\"").arg(m_validator->toString());
+	if(wl)
+	{
+		return QString("%1 [label=\"RerollDiceNode validatior: %2\"]").arg(m_id).arg(m_validator->toString());
+	}
+	else
+	{
+		return m_id;
+	}
+	//return QString("RerollDiceNode [label=\"RerollDiceNode validatior:%1\"");
 }
 void RerollDiceNode::setAddingMode(bool b)
 {
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index dead500..7b13f50 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -159,10 +159,14 @@ QString ScalarOperatorNode::toString(bool wl) const
             break;
 
     }
-if(wl)
-    return QString("ScalarOperatorNode [label=\"ScalarOperatorNode %1\"").arg(op);
-else
-    return QString("ScalarOperatorNode");
+	if(wl)
+	{
+		return QString("%1 [label=\"ScalarOperatorNode %2\"]").arg(m_id).arg(op);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 qint64 ScalarOperatorNode::getPriority() const
 {
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 727810e..ffece63 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -112,10 +112,14 @@ void SortResultNode::setSortAscending(bool asc)
 }
 QString SortResultNode::toString(bool wl) const
 {
-if(wl)
-    return QString("SortResultNode [label=\"SortResultNode %1\"").arg(m_ascending ? "Ascending":"Descending");
-else
-    return QString("SortResultNode");
+	if(wl)
+	{
+		return QString("%1 [label=\"SortResultNode %2\"]").arg(m_id).arg(m_ascending ? "Ascending":"Descending");
+	}
+	else
+	{
+		return m_id;
+	}
 
 }
 qint64 SortResultNode::getPriority() const
diff --git a/node/startingnode.cpp b/node/startingnode.cpp
index 15ea053..b57c630 100644
--- a/node/startingnode.cpp
+++ b/node/startingnode.cpp
@@ -15,13 +15,17 @@ void StartingNode::run(ExecutionNode*)
 }
 QString StartingNode::toString(bool withlabel) const
 {
-if(withlabel)
-    return "StartingNode [shape=box]";
-else
-    return "StartingNode";
+	if(withlabel)
+	{
+		return QString("%1 [label=\"StartingNode %2\"]").arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 
-}
+
 qint64 StartingNode::getPriority() const
 {
     qint64 priority=0;