diff options
| author |   Renaud G <renaud@rolisteam.org> | 2020-10-13 13:37:22 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2020-10-13 13:37:22 +0200 |
| commit | 8399e79d87a1c9313f99e076448eb2fae869b2e8 (patch) | |
| tree | 6d40df8ee51c6f0abec4117c2e384562f139c23d | |
| parent | fa2c9fe8754869c7df507fe1fa6143a1ef4bf84c (diff) | |
| download | OneRoll-8399e79d87a1c9313f99e076448eb2fae869b2e8.tar.gz OneRoll-8399e79d87a1c9313f99e076448eb2fae869b2e8.zip | |
Add some small fixes
| -rw-r--r-- | cli/main.cpp | 2 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cli/main.cpp b/cli/main.cpp index 392d555..6e9e49f 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -451,6 +451,8 @@ int startDiceParsing(QStringList& cmds, QString& treeFile, bool withColor, EXPOR #endif } } + else + rt = 1; } return rt; } diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 5551998..1d873c2 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -502,7 +502,7 @@ QStringList ParsingToolBox::allFirstResultAsString(bool& hasAlias) const { QVariant var; auto stringPair= hasResultOfType(Dice::RESULT_TYPE::STRING, node); - auto scalarPair= hasResultOfType(Dice::RESULT_TYPE::SCALAR, node, true); + auto scalarPair= hasResultOfType(Dice::RESULT_TYPE::SCALAR, node); if(stringPair.first) { stringListResult << stringPair.second.toString(); @@ -2341,7 +2341,10 @@ SubtituteInfo ParsingToolBox::readPlaceHolderFromString(const QString& source, i QString ParsingToolBox::number(qreal value) { - return QString::number(value, 'g', 20); + if(value > 1000000) + return QString::number(value, 'f', 20); + else + return QString::number(value); } ExportedDiceResult ParsingToolBox::finalDiceResultFromInstruction(ExecutionNode* start) |