aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/stringnode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/stringnode.cpp')
-rw-r--r--node/stringnode.cpp77
1 files changed, 3 insertions, 74 deletions
diff --git a/node/stringnode.cpp b/node/stringnode.cpp
index af2fcda..5c489be 100644
--- a/node/stringnode.cpp
+++ b/node/stringnode.cpp
@@ -28,86 +28,15 @@ QString StringNode::toString(bool withLabel) const
{
if(withLabel)
{
- return QString("%1 [label=\"StringNode %2\"]").arg(m_id).arg(m_data);
+ QString dataCopy = m_data;
+
+ return QString("%1 [label=\"StringNode %2\"]").arg(m_id).arg(dataCopy.replace('%','\\'));
}
else
{
return m_id;
}
}
-/*void StringNode::getScalarResult()
-{
- QString scalarText;
-
- if(m_diceParser->hasIntegerResultNotInFirst())
- {
- scalarText = QStringLiteral("%1").arg(m_diceParser->getLastIntegerResult());
- }
- else if(hasDiceList)
- {
- scalarText = QStringLiteral("%1").arg(m_diceParser->getSumOfDiceResult());
- }
-}*/
-
-/*bool StringNode::getMessageResult(QString& value, QString& command, QString& list)
-{
- QString scalarText;
- QString diceText;
- //QString pattern("");
-
-
-
- bool hasDiceList = false;
- if(m_diceParser->hasDiceResult())
- {
- ExportedDiceResult diceList;
- bool ok;
- m_diceParser->getLastDiceResult(diceList,ok);//fills the ExportedDiceResult
- diceText = diceToText(diceList);
- hasDiceList= true;
- }
- if(m_diceParser->hasSeparator())
- {
- bool ok;
- QStringList allStringlist = m_diceParser->getAllDiceResult(ok);
- if(ok)
- {
- QString patternColor("<span class=\"dice\">%1</span>");
- list = patternColor.arg(allStringlist.join(' '));
- scalarText = list;
- }
- }
- else if(m_diceParser->hasIntegerResultNotInFirst())
- {
- scalarText = QStringLiteral("%1").arg(m_diceParser->getLastIntegerResult());
- }
- else if(hasDiceList)
- {
- scalarText = QStringLiteral("%1").arg(m_diceParser->getSumOfDiceResult());
- }
- value=scalarText;
- list = diceText.trimmed();
- command = m_diceParser->getDiceCommand().toHtmlEscaped();
- if(m_diceParser->hasStringResult())
- {
- bool ok;
- QStringList allStringlist = m_diceParser->getAllStringResult(ok);
- if(ok)
- {
- QString patternColor("<span class=\"dice\">%1</span>");
- list = patternColor.arg(allStringlist.join(' '));
- value = list;
- }
- else
- {
- value = m_diceParser->getStringResult().replace("\n","<br/>");
- list = allStringlist.join(' ');
- return true;
- }
- }
-
- return false;
-}*/
qint64 StringNode::getPriority() const
{
qint64 priority=0;