diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-10-11 22:13:07 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-10-11 22:13:07 +0200 |
| commit | 9e9dd15316e80cae916c532d13ddc5ddc5e93697 (patch) | |
| tree | 52f0daa73bcd36d3562cb80847cc4536355448fc /result/diceresult.cpp | |
| parent | 80ff2a99b45a25695321cc84a30a3fbf3b797d54 (diff) | |
| parent | 1ccb6b4c0454fae8ebc4ebdca9ab74588d3d8707 (diff) | |
| download | OneRoll-9e9dd15316e80cae916c532d13ddc5ddc5e93697.tar.gz OneRoll-9e9dd15316e80cae916c532d13ddc5ddc5e93697.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'result/diceresult.cpp')
| -rw-r--r-- | result/diceresult.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/result/diceresult.cpp b/result/diceresult.cpp index 95122f1..ceb77b8 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -54,7 +54,6 @@ QVariant DiceResult::getResult(RESULT_TYPE type) break; case DICE_LIST: { - return QVariant(); break; } @@ -82,12 +81,19 @@ qreal DiceResult::getScalarResult() return 0; } -QString DiceResult::toString() +QString DiceResult::toString(bool wl) { QStringList scalarSum; foreach(Die* die,m_diceValues) { scalarSum << QString::number(die->getValue()); } - return QString("DiceResult_Value_%1_dice_%2").arg(getScalarResult()).arg(scalarSum.join('_')); + if(wl) + { + return QString("%3 [label=\"DiceResult Value %1 dice %2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id); + } + else + { + return m_id; + } } |