aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node
diff options
context:
space:
mode:
Diffstat (limited to 'node')
-rw-r--r--node/testnode.cpp48
-rw-r--r--node/testnode.h44
-rw-r--r--node/valueslistnode.cpp6
3 files changed, 5 insertions, 93 deletions
diff --git a/node/testnode.cpp b/node/testnode.cpp
deleted file mode 100644
index 263286b..0000000
--- a/node/testnode.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "testnode.h"
-#include "die.h"
-
-TestNode::TestNode() {}
-
-TestNode::~TestNode()
-{
- m_nextNode= nullptr;
- m_result= nullptr;
-}
-void TestNode::run(ExecutionNode* previous)
-{
- if(nullptr != m_nextNode)
- {
- m_nextNode->run(this);
- }
-}
-
-QString TestNode::toString(bool wl) const
-{
- if(wl)
- {
- return QStringLiteral("%1 [label=\"TestNode \"]").arg(m_id);
- }
- else
- {
- return m_id;
- }
-}
-qint64 TestNode::getPriority() const
-{
- qint64 priority= 4;
- return priority;
-}
-ExecutionNode* TestNode::getCopy() const
-{
- TestNode* node= new TestNode();
- if(nullptr != m_nextNode)
- {
- node->setNextNode(m_nextNode->getCopy());
- }
- return node;
-}
-
-void TestNode::setResult(Result* result)
-{
- m_result= result;
-}
diff --git a/node/testnode.h b/node/testnode.h
deleted file mode 100644
index 5c918ee..0000000
--- a/node/testnode.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef TESTNODE_H
-#define TESTNODE_H
-
-#include <Qt>
-
-#include "executionnode.h"
-#include "result/diceresult.h"
-#include <utility>
-/**
- * @brief The TestNode class replaces any kind of node for test purpose.
- */
-class TestNode : public ExecutionNode
-{
-public:
- /**
- * @brief TestNode builds an instance
- * @param faces, number of faces of dices
- * @param offset, first value of dice.
- */
- TestNode();
- virtual ~TestNode() override;
-
- /**
- * @brief run - starts to roll dice.
- */
- virtual void run(ExecutionNode*) override;
- /**
- * @brief toString
- * @param wl
- * @return use to generate dot tree;
- */
- virtual QString toString(bool wl) const override;
- /**
- * @brief getPriority
- * @return priority for dice roll: 4 (higher)
- */
- virtual qint64 getPriority() const override;
-
- virtual ExecutionNode* getCopy() const override;
-
- void setResult(Result* result);
-};
-
-#endif // TESTNODE_H
diff --git a/node/valueslistnode.cpp b/node/valueslistnode.cpp
index e022741..b31ee84 100644
--- a/node/valueslistnode.cpp
+++ b/node/valueslistnode.cpp
@@ -1,5 +1,7 @@
#include "valueslistnode.h"
+#include "variablenode.h"
+
ValuesListNode::ValuesListNode() : m_diceResult(new DiceResult())
{
m_result= m_diceResult;
@@ -16,7 +18,9 @@ void ValuesListNode::run(ExecutionNode* previous)
continue;
auto val= result->getResult(Result::SCALAR).toInt();
Die* die= new Die();
- die->displayed();
+ auto dyna= dynamic_cast<VariableNode*>(node);
+ if(nullptr != dyna)
+ die->displayed();
die->insertRollValue(val);
m_diceResult->insertResult(die);
}