From ae81e675a117819aa5a2eb7f9be687aff5a6bb9f Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 20 Aug 2015 11:56:10 +0200 Subject: add bool parameter to toString() function in node. --- node/executionnode.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'node/executionnode.cpp') 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 + 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()) { } -- cgit v1.2.3-70-g09d2 From 831f75a83ca3e5734d3c110af584a0f3bf7430e7 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 20 Aug 2015 12:25:21 +0200 Subject: add bool for toString() in result. --- node/executionnode.cpp | 16 ++++++++++------ result/diceresult.cpp | 11 +++++++++-- result/diceresult.h | 2 +- result/result.cpp | 19 ++++++++++--------- result/result.h | 3 ++- result/scalarresult.cpp | 11 +++++++++-- result/scalarresult.h | 2 +- result/stringresult.cpp | 11 +++++++++-- 8 files changed, 51 insertions(+), 24 deletions(-) (limited to 'node/executionnode.cpp') diff --git a/node/executionnode.cpp b/node/executionnode.cpp index c6f3915..0d15825 100644 --- a/node/executionnode.cpp +++ b/node/executionnode.cpp @@ -9,7 +9,6 @@ ExecutionNode::ExecutionNode() } ExecutionNode::~ExecutionNode() { - if(NULL!=m_result) { delete m_result; @@ -55,19 +54,24 @@ ExecutionNode* ExecutionNode::getPreviousNode() const } void ExecutionNode::generateDotTree(QString& s) { - s.append(toString()); + s.append(toString(true)); + s.append(";\n"); + if(NULL!=m_nextNode) { + s.append(toString(false)); s.append(" -> "); - s.append(m_nextNode->toString()); - s.append(" [label=\"nextNode\"];\n"); + s.append(m_nextNode->toString(false)); + s.append("\n"); +// s.append(" [label=\"nextNode\"];\n"); m_nextNode->generateDotTree(s); } else { + s.append(toString(false)); s.append(" -> "); - s.append("NULL"); - s.append(" [label=\"nextNode\"];\n"); + s.append("NULL;\n;"); + // s.append(" [label=\"nextNode\"];\n"); m_result->generateDotTree(s); } diff --git a/result/diceresult.cpp b/result/diceresult.cpp index 95122f1..65d4a0b 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -82,12 +82,19 @@ qreal DiceResult::getScalarResult() return 0; } -QString DiceResult::toString() +QString DiceResult::toString(bool wl) { QStringList scalarSum; foreach(Die* die,m_diceValues) { scalarSum << QString::number(die->getValue()); } - return QString("DiceResult_Value_%1_dice_%2").arg(getScalarResult()).arg(scalarSum.join('_')); + if(wl) + { + return QString("%3 [label=\"DiceResult_Value_%1_dice_%2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id); + } + else + { + return m_id; + } } diff --git a/result/diceresult.h b/result/diceresult.h index 07378d1..84a4621 100644 --- a/result/diceresult.h +++ b/result/diceresult.h @@ -65,7 +65,7 @@ public: * @brief toString * @return */ - virtual QString toString(); + virtual QString toString(bool wl); private: qreal getScalarResult(); 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 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(); -}*/ + diff --git a/result/result.h b/result/result.h index 3d635bc..7fd32da 100644 --- a/result/result.h +++ b/result/result.h @@ -77,11 +77,12 @@ public: * @brief toString * @return */ - virtual QString toString() = 0; + virtual QString toString(bool wl) = 0; protected: int m_resultTypes;/// @brief private: Result* m_previous;/// @brief + QString m_id; }; diff --git a/result/scalarresult.cpp b/result/scalarresult.cpp index a998608..9168938 100644 --- a/result/scalarresult.cpp +++ b/result/scalarresult.cpp @@ -36,7 +36,14 @@ QVariant ScalarResult::getResult(Result::RESULT_TYPE type) return m_value; } -QString ScalarResult::toString() +QString ScalarResult::toString(bool wl) { - return QString("ScalarResult_Value_%1").arg(m_value); + if(wl) + { + return QString("%2 [label=\"ScalarResult %1\"]").arg(m_value).arg(m_id); + } + else + { + return m_id; + } } diff --git a/result/scalarresult.h b/result/scalarresult.h index 8a0fa11..f441c9b 100644 --- a/result/scalarresult.h +++ b/result/scalarresult.h @@ -49,7 +49,7 @@ public: * @brief toString * @return */ - virtual QString toString(); + virtual QString toString(bool); private: qreal m_value; diff --git a/result/stringresult.cpp b/result/stringresult.cpp index 4dbd577..b7dc39d 100644 --- a/result/stringresult.cpp +++ b/result/stringresult.cpp @@ -31,7 +31,14 @@ QVariant StringResult::getResult(RESULT_TYPE type) return QVariant(); } -QString StringResult::toString() +QString StringResult::toString(bool wl) { - return QString("StringResult_value_%1").arg(getText().replace(" ","_")); + if(wl) + { + return QString("%2 [label=\"StringResult_value_%1\"]").arg(getText().replace(" ","_")).arg(m_id); + } + else + { + return m_id; + } } -- cgit v1.2.3-70-g09d2 From 784c00cc2e0d224723b2480b5a7776ccd26c90b3 Mon Sep 17 00:00:00 2001 From: Renaud G 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 'node/executionnode.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 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 594bede3485085f0211e60a3ab30050b651c884e Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 20 Aug 2015 12:54:18 +0200 Subject: fix compilation --- node/executionnode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'node/executionnode.cpp') diff --git a/node/executionnode.cpp b/node/executionnode.cpp index cdda93d..f759884 100644 --- a/node/executionnode.cpp +++ b/node/executionnode.cpp @@ -3,7 +3,7 @@ #include ExecutionNode::ExecutionNode() - : m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()) + : m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())) { } -- cgit v1.2.3-70-g09d2 From 065c8f53cebd098d11695eaec07c178d78737c8e Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 20 Aug 2015 13:00:38 +0200 Subject: remove useless ; --- node/executionnode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'node/executionnode.cpp') diff --git a/node/executionnode.cpp b/node/executionnode.cpp index f759884..abcb7cf 100644 --- a/node/executionnode.cpp +++ b/node/executionnode.cpp @@ -70,7 +70,7 @@ void ExecutionNode::generateDotTree(QString& s) { s.append(toString(false)); s.append(" -> "); - s.append("NULL;\n;"); + s.append("NULL;\n"); s.append(toString(false)); -- cgit v1.2.3-70-g09d2