diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-08-20 12:53:16 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-08-20 12:53:16 +0200 |
| commit | 6d39993c62ffe61cb73cba3b4fc2c7631c4590a5 (patch) | |
| tree | 7b614d8ce4b3a7b6e6eec9e3657fec75c8e7fed3 | |
| parent | eb4631902d1aca34f1898de5ecaa4cad38fe18c9 (diff) | |
| parent | 784c00cc2e0d224723b2480b5a7776ccd26c90b3 (diff) | |
| download | OneRoll-6d39993c62ffe61cb73cba3b4fc2c7631c4590a5.tar.gz OneRoll-6d39993c62ffe61cb73cba3b4fc2c7631c4590a5.zip | |
Merge branch 'rangeInList' of github.com:Rolisteam/DiceParser into rangeInList
| -rw-r--r-- | node/executionnode.cpp | 11 | ||||
| -rw-r--r-- | result/diceresult.cpp | 2 | ||||
| -rw-r--r-- | result/result.cpp | 3 |
3 files changed, 11 insertions, 5 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); } 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"); } |