improve output for dot system

10 files changed, 44 insertions, 11 deletions

diff --git a/node/explosedicenode.cpp b/node/explosedicenode.cpp
index 4eae270..c0ebfe7 100644
--- a/node/explosedicenode.cpp
+++ b/node/explosedicenode.cpp
@@ -46,7 +46,7 @@ void ExploseDiceNode::setValidator(Validator* val)
 }
 QString ExploseDiceNode::toString() const
 {
-    return QString("ExploseDiceNode");
+    return QString("ExploseDiceNode [label=\"ExploseDiceNode %1\"]").arg(m_validator->toString());
 }
 qint64 ExploseDiceNode::getPriority() const
 {
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index 859f733..a225ac4 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -64,7 +64,7 @@ void KeepDiceExecNode::setDiceKeepNumber(quint64 n)
 }
 QString KeepDiceExecNode::toString() const
 {
-    return QString("KeepDiceExecNode");
+    return QString("KeepDiceExecNode [label=\"KeepDiceExecNode %1\"]").arg(m_numberOfDice);
 }
 qint64 KeepDiceExecNode::getPriority() const
 {
diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp
index 4fd4ab0..ddb8ac9 100644
--- a/node/listaliasnode.cpp
+++ b/node/listaliasnode.cpp
@@ -34,7 +34,7 @@ void ListAliasNode::run(ExecutionNode* previous )
 	{
 		if(previous->getResult() == NULL)
 		{
-			txtResult->setText(toString());
+            txtResult->setText(buildList());
 
 		}
 		else
@@ -49,7 +49,7 @@ void ListAliasNode::run(ExecutionNode* previous )
 		m_nextNode->run(this);
 	}
 }
-QString ListAliasNode::toString() const
+QString ListAliasNode::buildList() const
 {
 	QString result(QObject::tr("List of Alias:\n"));
     foreach(DiceAlias* key, *m_aliasList)
@@ -58,7 +58,16 @@ QString ListAliasNode::toString() const
 	}
 	return result;
 }
+QString ListAliasNode::toString() const
+{
+    QStringList resultList;
+    foreach(DiceAlias* key, *m_aliasList)
+    {
+        resultList <<  "{" <<key->getCommand() << key->getValue()<<  "}";
+    }
+    return QString("ListAliasNode [label=\"ListAliasNode %1\"]").arg(resultList.join(","));
 
+}
 qint64 ListAliasNode::getPriority() const
 {
 	return 0;
diff --git a/node/listaliasnode.h b/node/listaliasnode.h
index e08d073..e8f8b0f 100644
--- a/node/listaliasnode.h
+++ b/node/listaliasnode.h
@@ -42,7 +42,12 @@ public:
 	 * @brief toString
 	 * @return
 	 */
-	virtual QString toString()const;
+    virtual QString toString() const;
+    /**
+     * @brief buildList
+     * @return
+     */
+    virtual QString buildList() const;
 	/**
 	 * @brief getPriority
 	 * @return
diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp
index 6512df5..fdc17a5 100644
--- a/node/listsetrollnode.cpp
+++ b/node/listsetrollnode.cpp
@@ -41,7 +41,7 @@ QStringList ListSetRollNode::getList()
 }
 QString ListSetRollNode::toString() const
 {
-    return QString("ListSetRollNode_").arg(m_values.join(','));
+    return QString("ListSetRollNode [label=\"ListSetRoll list:%1\"]").arg(m_values.join(','));
 }
 qint64 ListSetRollNode::getPriority() const
 {
diff --git a/node/numbernode.cpp b/node/numbernode.cpp
index ba063db..c63aadf 100644
--- a/node/numbernode.cpp
+++ b/node/numbernode.cpp
@@ -46,7 +46,7 @@ void NumberNode::setNumber(qint64 a)
 }
 QString NumberNode::toString() const
 {
-    return QString("NumberNode_%1").arg(m_number);
+    return QString("NumberNode [label=\"NumberNode %1\"]").arg(m_number);
 }
 qint64 NumberNode::getPriority() const
 {
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp
index a7cc8c4..038a3ec 100644
--- a/node/rerolldicenode.cpp
+++ b/node/rerolldicenode.cpp
@@ -48,7 +48,7 @@ void RerollDiceNode::setValidator(Validator* val)
 }
 QString RerollDiceNode::toString() const
 {
-    return "RerollDiceNode";
+    return QString("RerollDiceNode [label=\"RerollDiceNode validatior:%1\"").arg(m_validator->toString());
 }
 void RerollDiceNode::setAddingMode(bool b)
 {
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index b7c183f..c5f91f9 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -140,7 +140,26 @@ qint64 ScalarOperatorNode::multiple(qint64 a,qint64 b)
 }
 QString ScalarOperatorNode::toString() const
 {
-    return "ScalarOperatorNode";
+    QString op="";
+    switch(m_operator)
+    {
+        case PLUS:
+            op="+";
+            break;
+        case MINUS:
+            op="-";
+            break;
+        case MULTIPLICATION:
+            op="*";
+            break;
+        case DIVIDE:
+            op="/";
+            break;
+        default:
+            break;
+
+    }
+    return QString("ScalarOperatorNode [label=\"ScalarOperatorNode %1\"").arg(op);
 }
 qint64 ScalarOperatorNode::getPriority() const
 {
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index b3e6b49..44a25f0 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -112,7 +112,7 @@ void SortResultNode::setSortAscending(bool asc)
 }
 QString SortResultNode::toString() const
 {
-    return "SortResultNode";
+    return QString("SortResultNode [label=\"SortResultNode %1\"").arg(m_ascending ? "Ascending":"Descending");
 }
 qint64 SortResultNode::getPriority() const
 {
diff --git a/node/startingnode.cpp b/node/startingnode.cpp
index 48ac4a4..b15101b 100644
--- a/node/startingnode.cpp
+++ b/node/startingnode.cpp
@@ -15,7 +15,7 @@ void StartingNode::run(ExecutionNode*)
 }
 QString StartingNode::toString() const
 {
-    return "StartingNode";
+    return "StartingNode [shape=box]";
 }
 qint64 StartingNode::getPriority() const
 {