diff options
| -rw-r--r-- | include/parsingtoolbox.h | 1 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/parsingtoolbox.h b/include/parsingtoolbox.h index ae70c2c..f91c2f6 100644 --- a/include/parsingtoolbox.h +++ b/include/parsingtoolbox.h @@ -189,6 +189,7 @@ public: const QMap<Dice::ERROR_CODE, QString>& getWarningList() const; // Traversal functions + static QString number(qreal value); static ExecutionNode* getLatestNode(ExecutionNode* node); static ExecutionNode* getLeafNode(ExecutionNode* start); const std::vector<ExecutionNode*>& getStartNodes(); diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index f009155..23486cd 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -510,7 +510,7 @@ QStringList ParsingToolBox::allFirstResultAsString(bool& hasAlias) const } else if(scalarPair.first) { - stringListResult << QString::number(scalarPair.second.toReal()); + stringListResult << number(scalarPair.second.toReal()); hasAlias= true; } } @@ -606,7 +606,7 @@ std::pair<QString, QString> ParsingToolBox::finalScalarResult() const auto listScalar= scalarResultsFromEachInstruction(); for(auto val : listScalar) { - strLst << QString::number(val); + strLst << number(val); } scalarText= QString("%1").arg(strLst.join(',')); lastScalarText= strLst.last(); @@ -617,7 +617,7 @@ std::pair<QString, QString> ParsingToolBox::finalScalarResult() const QStringList strLst; for(auto val : values) { - strLst << QString::number(val); + strLst << number(val); } scalarText= QString("%1").arg(strLst.join(',')); } @@ -2339,6 +2339,11 @@ SubtituteInfo ParsingToolBox::readPlaceHolderFromString(const QString& source, i return info; } +QString ParsingToolBox::number(qreal value) +{ + return QString::number(value, 'g', 20); +} + ExportedDiceResult ParsingToolBox::finalDiceResultFromInstruction(ExecutionNode* start) { ExecutionNode* next= ParsingToolBox::getLeafNode(start); |