diff options
| -rw-r--r-- | node/mergenode.cpp | 7 | ||||
| -rw-r--r-- | node/variablenode.cpp | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/node/mergenode.cpp b/node/mergenode.cpp index e2d46cb..f808854 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -50,7 +50,7 @@ void MergeNode::run(ExecutionNode* previous) DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult); if(nullptr!=dice) { - ///@todo improve here to set homogeneous while is really + ///@todo TODO improve here to set homogeneous while is really m_diceResult->setHomogeneous(false); for(Die* die : dice->getResultList()) { @@ -112,9 +112,9 @@ QString MergeNode::toString(bool withLabel) const qint64 MergeNode::getPriority() const { qint64 priority=0; - if(nullptr!=m_nextNode) + if(nullptr!=m_previousNode) { - priority = m_nextNode->getPriority(); + priority = m_previousNode->getPriority(); } return priority; } @@ -126,7 +126,6 @@ ExecutionNode* MergeNode::getCopy() const node->setNextNode(m_nextNode->getCopy()); } return node; - } std::vector<ExecutionNode *>* MergeNode::getStartList() const diff --git a/node/variablenode.cpp b/node/variablenode.cpp index 9963af9..d636a94 100644 --- a/node/variablenode.cpp +++ b/node/variablenode.cpp @@ -14,7 +14,7 @@ void VariableNode::run(ExecutionNode *previous) value = ParsingToolBox::getLatestNode(value); if(nullptr != value) { - m_result = value->getResult(); + m_result = value->getResult()->getCopy(); if(nullptr!=m_nextNode) { m_nextNode->run(this); @@ -23,7 +23,7 @@ void VariableNode::run(ExecutionNode *previous) } else { - m_errors.insert(NO_VARIBALE,QObject::tr("No variable at index:%1").arg(m_index)); + m_errors.insert(NO_VARIBALE,QObject::tr("No variable at index:%1").arg(m_index+1)); } } @@ -31,7 +31,7 @@ QString VariableNode::toString(bool withLabel) const { if(withLabel) { - return QString("%1 [label=\"VariableNode index: %2\"]").arg(m_id).arg(m_index); + return QString("%1 [label=\"VariableNode index: %2\"]").arg(m_id).arg(m_index+1); } else { @@ -42,9 +42,9 @@ QString VariableNode::toString(bool withLabel) const qint64 VariableNode::getPriority() const { qint64 priority=0; - if(nullptr!=m_nextNode) + if(nullptr!=m_previousNode) { - priority = m_nextNode->getPriority(); + priority = m_previousNode->getPriority(); } return priority; } |