diff options
| author |   Renaud G <renaud@rolisteam.org> | 2020-07-11 00:45:44 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2020-08-21 22:51:43 +0200 |
| commit | 8087429c108c4f6bef5f792ce256b8d5b8b69101 (patch) | |
| tree | d847b1acadb3d4ac7166bda415794f61816de682 /diceroller.cpp | |
| parent | 35d019ec86f272d4189852a3e69ede403c415a8c (diff) | |
| download | OneRoll-8087429c108c4f6bef5f792ce256b8d5b8b69101.tar.gz OneRoll-8087429c108c4f6bef5f792ce256b8d5b8b69101.zip | |
Rework exporting
Diffstat (limited to 'diceroller.cpp')
| -rw-r--r-- | diceroller.cpp | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/diceroller.cpp b/diceroller.cpp index cba24df..e970a7c 100644 --- a/diceroller.cpp +++ b/diceroller.cpp @@ -60,39 +60,42 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList) for(auto& face : keys) { QStringList result; - ListDiceResult diceResult= dice.value(face); - for(const HighLightDice& tmp : diceResult) + auto list= dice.value(face); + for(auto diceResult : list) { - QStringList diceListStr; - QStringList diceListChildren; - int i= 0; - for(qint64& dievalue : tmp.getResult()) + for(const HighLightDice& tmp : diceResult) { - QString prefix("%1"); - if(i == 0) + QStringList diceListStr; + QStringList diceListChildren; + int i= 0; + for(qint64& dievalue : tmp.result()) { - diceListStr << prefix.arg(QString::number(dievalue)); + QString prefix("%1"); + if(i == 0) + { + diceListStr << prefix.arg(QString::number(dievalue)); + } + else + { + diceListChildren << prefix.arg(QString::number(dievalue)); + } + ++i; } - else + if(!diceListChildren.isEmpty()) { - diceListChildren << prefix.arg(QString::number(dievalue)); + diceListStr << QString("[%1]").arg(diceListChildren.join(' ')); } - ++i; + result << diceListStr.join(' '); } - if(!diceListChildren.isEmpty()) + + if(keys.size() > 1) { - diceListStr << QString("[%1]").arg(diceListChildren.join(' ')); + resultGlobal << QString(" d%2:(%1)").arg(result.join(',')).arg(face); + } + else + { + resultGlobal << result; } - result << diceListStr.join(' '); - } - - if(keys.size() > 1) - { - resultGlobal << QString(" d%2:(%1)").arg(result.join(',')).arg(face); - } - else - { - resultGlobal << result; } } global << resultGlobal.join(' '); |