From 831f75a83ca3e5734d3c110af584a0f3bf7430e7 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 20 Aug 2015 12:25:21 +0200
Subject: add bool for toString() in result.

---
 result/result.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'result/result.cpp')

diff --git a/result/result.cpp b/result/result.cpp
index 257045c..6451e63 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -20,9 +20,10 @@
 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
 ***************************************************************************/
 #include "result.h"
+#include <QUuid>
 
 Result::Result()
-    : m_previous(NULL)
+	: m_previous(NULL),m_id(QUuid::createUuid().toString())
 {
 }
 
@@ -47,22 +48,22 @@ bool Result::hasResultOfType(RESULT_TYPE type) const
 }
 void Result::generateDotTree(QString& s)
 {
-    s.append(toString());
+	s.append(toString(true));
+	s.append(";\n");
+
     if(NULL!=m_previous)
     {
+		s.append(toString(false));
         s.append(" -> ");
-        s.append(m_previous->toString());
-        s.append(" [label=\"previousResult\"];\n");
+		s.append(m_previous->toString(true));
+		s.append("\n");
         m_previous->generateDotTree(s);
     }
     {
         s.append(" -> ");
-        s.append("NULL");
+		s.append("NULL;\n");
         s.append(" [label=\"previousResult\"];\n");
     }
 
 }
-/*QString Result::toString()
-{
-    return QString();
-}*/
+
-- 
cgit v1.2.3-70-g09d2


From 784c00cc2e0d224723b2480b5a7776ccd26c90b3 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 20 Aug 2015 12:52:50 +0200
Subject: improve the dot generation.

---
 node/executionnode.cpp | 11 ++++++++---
 result/diceresult.cpp  |  2 +-
 result/result.cpp      |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'result/result.cpp')

diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index 0d15825..cdda93d 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -3,7 +3,7 @@
 #include <QUuid>
 
 ExecutionNode::ExecutionNode()
-	: m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QUuid::createUuid().toString())
+	: m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())
 {
 
 }
@@ -62,7 +62,7 @@ void ExecutionNode::generateDotTree(QString& s)
 		s.append(toString(false));
         s.append(" -> ");
 		s.append(m_nextNode->toString(false));
-		s.append("\n");
+		s.append(";\n");
 //        s.append(" [label=\"nextNode\"];\n");
         m_nextNode->generateDotTree(s);
     }
@@ -71,7 +71,12 @@ void ExecutionNode::generateDotTree(QString& s)
 		s.append(toString(false));
         s.append(" -> ");
 		s.append("NULL;\n;");
-  //      s.append(" [label=\"nextNode\"];\n");
+
+
+		s.append(toString(false));
+		s.append(" ->");
+		s.append(m_result->toString(false));
+		s.append(" [label=\"Result\"];\n");
 
         m_result->generateDotTree(s);
     }
diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index 65d4a0b..6c46de0 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -91,7 +91,7 @@ QString DiceResult::toString(bool wl)
     }
 	if(wl)
 	{
-		return QString("%3 [label=\"DiceResult_Value_%1_dice_%2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id);
+		return QString("%3 [label=\"DiceResult Value %1 dice %2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id);
 	}
 	else
 	{
diff --git a/result/result.cpp b/result/result.cpp
index 6451e63..401123a 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -60,8 +60,9 @@ void Result::generateDotTree(QString& s)
         m_previous->generateDotTree(s);
     }
     {
+		s.append(toString(false));
         s.append(" -> ");
-		s.append("NULL;\n");
+		s.append("NULL");
         s.append(" [label=\"previousResult\"];\n");
     }
 
-- 
cgit v1.2.3-70-g09d2


From 489baf54f6c4d5f511012f2a2eadb97ba80b551d Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 20 Aug 2015 12:59:10 +0200
Subject: escaped the id for result

---
 result/result.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'result/result.cpp')

diff --git a/result/result.cpp b/result/result.cpp
index 401123a..7b6633c 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -23,7 +23,7 @@
 #include <QUuid>
 
 Result::Result()
-	: m_previous(NULL),m_id(QUuid::createUuid().toString())
+	: m_previous(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
 {
 }
 
-- 
cgit v1.2.3-70-g09d2