diff options
| -rw-r--r-- | cli/main.cpp | 13 | ||||
| -rw-r--r-- | diceparser.cpp | 6 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 4 |
3 files changed, 11 insertions, 12 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()) { diff --git a/diceparser.cpp b/diceparser.cpp index f6cb59a..f8f82d6 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -542,7 +542,6 @@ bool DiceParser::readDice(QString& str,ExecutionNode* & node) { int face = abs(num - end)+1; - qDebug()<< num << end<< face; DiceRollerNode* drNode = new DiceRollerNode(face,num); node = drNode; ExecutionNode* current = drNode; @@ -774,8 +773,11 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous, bool hasDice)/ previous = addRollDiceNode(DEFAULT_FACES_NUMBER,previous); } DiceRollerNode* nodeTmp = dynamic_cast<DiceRollerNode*>(previous); + if(NULL!=nodeTmp) + { - previous = addExploseDiceNode(nodeTmp->getFaces(),previous); + previous = addExploseDiceNode(nodeTmp->getFaces(),previous); + } node = m_parsingToolbox->addSort(previous,ascending); diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 0052f07..f6b1f12 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -238,16 +238,13 @@ bool ParsingToolBox::readDiceRange(QString& str,int& start, int& end) { bool expectSquareBrasket=false; - qDebug()<<"readDiceRange"<<str; if((str.startsWith("["))) { str=str.remove(0,1); expectSquareBrasket = true; } -qDebug()<<"readDiceRange"<<str; if(readNumber(str,start)) { - qDebug()<<"readDiceRange"<<str; if(str.startsWith("-")) { str=str.remove(0,1); @@ -270,7 +267,6 @@ qDebug()<<"readDiceRange"<<str; { return false; } - qDebug()<<"readDiceRange"<<str; } } |