diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-05-17 00:05:06 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-05-17 00:05:06 +0200 |
| commit | c8c9bffb2b439b95d5061d639ebecec07271ae01 (patch) | |
| tree | d9d77f9a2b0bb5cee7e9b4d4f2c500d7a33bdc52 /cli/main.cpp | |
| parent | bb89b91d9919ad9fed8b9d30ea0df79ceea4d3f7 (diff) | |
| parent | 2f24c7b8361d87b67e0a204b1f054d750f650d66 (diff) | |
| download | OneRoll-c8c9bffb2b439b95d5061d639ebecec07271ae01.tar.gz OneRoll-c8c9bffb2b439b95d5061d639ebecec07271ae01.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'cli/main.cpp')
| -rw-r--r-- | cli/main.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cli/main.cpp b/cli/main.cpp index f6197ce..9a966ba 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -43,7 +43,7 @@ QTextStream out(stdout, QIODevice::WriteOnly); -QString diceToText(ExportedDiceResult& dice) +QString diceToText(ExportedDiceResult& dice,bool highlight) { QStringList resultGlobal; foreach(int face, dice.keys()) @@ -62,10 +62,9 @@ QString diceToText(ExportedDiceResult& dice) qint64 dievalue = tmp.first[i]; QString prefix("%1"); - if(tmp.second) + if((tmp.second)&&(highlight)) { prefix = "\e[0;31m%1\e[0m"; - } if(i==0) @@ -116,7 +115,7 @@ void startDiceParsing(QString& cmd,QString& treeFile,bool highlight) ExportedDiceResult list; parser->getLastDiceResult(list); - QString diceText = diceToText(list); + QString diceText = diceToText(list,highlight); QString scalarText; QString str; @@ -128,8 +127,10 @@ void startDiceParsing(QString& cmd,QString& treeFile,bool highlight) { scalarText = QString("%1").arg(parser->getSumOfDiceResult()); } - - str = QString("Result: \e[0;31m%1\e[0m, details:[%3 (%2)]").arg(scalarText).arg(diceText).arg(parser->getDiceCommand()); + if(highlight) + str = QString("Result: \e[0;31m%1\e[0m, details:[%3 (%2)]").arg(scalarText).arg(diceText).arg(parser->getDiceCommand()); + else + str = QString("Result: %1, details:[%3 (%2)]").arg(scalarText).arg(diceText).arg(parser->getDiceCommand()); if(parser->hasStringResult()) { |