diff options
Diffstat (limited to 'node')
| -rw-r--r-- | node/helpnode.cpp | 5 | ||||
| -rw-r--r-- | node/listaliasnode.cpp | 3 | ||||
| -rw-r--r-- | node/listsetrollnode.cpp | 10 | ||||
| -rw-r--r-- | node/occurencecountnode.cpp | 3 | ||||
| -rw-r--r-- | node/repeaternode.cpp | 3 | ||||
| -rw-r--r-- | node/stringnode.cpp | 3 |
6 files changed, 19 insertions, 8 deletions
diff --git a/node/helpnode.cpp b/node/helpnode.cpp index 7748012..af1b2fd 100644 --- a/node/helpnode.cpp +++ b/node/helpnode.cpp @@ -31,7 +31,7 @@ void HelpNode::run(ExecutionNode* previous) if((nullptr == previous) && (txtResult != nullptr)) { - txtResult->setText(QObject::tr("Rolisteam Dice Parser:\n" + txtResult->addText(QObject::tr("Rolisteam Dice Parser:\n" "\n" "Example (with ! as prefix):\n" "!2d6\n" @@ -100,9 +100,10 @@ void HelpNode::run(ExecutionNode* previous) } else if(nullptr != previous) { - txtResult->setText(previous->getHelp()); + txtResult->addText(previous->getHelp()); m_result->setPrevious(previous->getResult()); } + txtResult->finished(); if(nullptr != m_nextNode) { diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp index 7aa1c32..bc930da 100644 --- a/node/listaliasnode.cpp +++ b/node/listaliasnode.cpp @@ -30,7 +30,8 @@ void ListAliasNode::run(ExecutionNode* previous) StringResult* txtResult= dynamic_cast<StringResult*>(m_result); txtResult->setHighLight(false); - txtResult->setText(buildList()); + txtResult->addText(buildList()); + txtResult->finished(); if(nullptr != previous) { // txtResult->setText(previous->getHelp()); diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp index 565a609..5caae34 100644 --- a/node/listsetrollnode.cpp +++ b/node/listsetrollnode.cpp @@ -21,6 +21,8 @@ #include "listsetrollnode.h" #include "die.h" +#include <QDebug> + ListSetRollNode::ListSetRollNode() : m_diceResult(new DiceResult()), m_stringResult(new StringResult()), m_unique(false) { m_result= m_stringResult; @@ -71,16 +73,20 @@ void ListSetRollNode::run(ExecutionNode* previous) else { m_result->setPrevious(result); - QStringList rollResult; for(quint64 i= 0; i < diceCount; ++i) { + QStringList rollResult; Die* die= new Die(); computeFacesNumber(die); die->roll(); m_diceResult->insertResult(die); getValueFromDie(die, rollResult); + for(auto str : rollResult) + { + m_stringResult->addText(str); + } } - m_stringResult->setText(rollResult.join(",")); + m_stringResult->finished(); } if(nullptr != m_nextNode) { diff --git a/node/occurencecountnode.cpp b/node/occurencecountnode.cpp index f82fa35..5140d19 100644 --- a/node/occurencecountnode.cpp +++ b/node/occurencecountnode.cpp @@ -148,7 +148,8 @@ void OccurenceCountNode::runForStringResult(const std::map<qint64, qint64>& mapO else result= QObject::tr("No matching result"); - m_stringResult->setText(QStringLiteral("%1 - [%2]").arg(result).arg(resultList.join(','))); + m_stringResult->addText(QStringLiteral("%1 - [%2]").arg(result).arg(resultList.join(','))); + m_stringResult->finished(); } void OccurenceCountNode::runForDiceResult(const std::map<qint64, qint64>& mapOccurence) { diff --git a/node/repeaternode.cpp b/node/repeaternode.cpp index 26fab8f..e5e5c81 100644 --- a/node/repeaternode.cpp +++ b/node/repeaternode.cpp @@ -101,7 +101,8 @@ void RepeaterNode::run(ExecutionNode* previousNode) list.append(QStringLiteral("%1 - Details [%2]").arg(value).arg(diceStr.join(","))); } }); - string->setText(list.join('\n')); + string->addText(list.join('\n')); + string->finished(); m_result= string; } diff --git a/node/stringnode.cpp b/node/stringnode.cpp index 78b270a..e908463 100644 --- a/node/stringnode.cpp +++ b/node/stringnode.cpp @@ -21,7 +21,8 @@ void StringNode::run(ExecutionNode* previous) void StringNode::setString(QString str) { m_data= str; - m_stringResult->setText(m_data); + m_stringResult->addText(m_data); + m_stringResult->finished(); } QString StringNode::toString(bool withLabel) const { |