aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/executionnode.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-08-20 12:53:16 +0200
committerRenaud G <renaud@rolisteam.org>2015-08-20 12:53:16 +0200
commit6d39993c62ffe61cb73cba3b4fc2c7631c4590a5 (patch)
tree7b614d8ce4b3a7b6e6eec9e3657fec75c8e7fed3 /node/executionnode.cpp
parenteb4631902d1aca34f1898de5ecaa4cad38fe18c9 (diff)
parent784c00cc2e0d224723b2480b5a7776ccd26c90b3 (diff)
downloadOneRoll-6d39993c62ffe61cb73cba3b4fc2c7631c4590a5.tar.gz
OneRoll-6d39993c62ffe61cb73cba3b4fc2c7631c4590a5.zip
Merge branch 'rangeInList' of github.com:Rolisteam/DiceParser into rangeInList
Diffstat (limited to 'node/executionnode.cpp')
-rw-r--r--node/executionnode.cpp11
1 files changed, 8 insertions, 3 deletions
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);
}