From c671d21b54d43dbd6112f3ab50fc6ebd63dc4aef Mon Sep 17 00:00:00 2001 From: Renaud Guezennec Date: Thu, 4 Feb 2016 17:58:00 +0100 Subject: Add Management of Color --- diceparser.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'diceparser.cpp') diff --git a/diceparser.cpp b/diceparser.cpp index 98a8d29..ba75b01 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -40,6 +40,7 @@ #include "node/listaliasnode.h" #include "node/mergenode.h" #include "node/ifnode.h" +#include "node/paintnode.h" #define DEFAULT_FACES_NUMBER 10 @@ -61,7 +62,9 @@ DiceParser::DiceParser() m_OptionOp->insert(QStringLiteral("r"),Reroll); m_OptionOp->insert(QStringLiteral("e"),Explosing); m_OptionOp->insert(QStringLiteral("a"),RerollAndAdd); + m_OptionOp->insert(QStringLiteral("m"),Merge); m_OptionOp->insert(QStringLiteral("i"),ifOperator); + m_OptionOp->insert(QStringLiteral("p"),Painter); m_aliasList = new QList(); @@ -476,8 +479,9 @@ void DiceParser::getLastDiceResult(ExportedDiceResult& diceValues,bool& homogene valuesResult.append(i); } } - QPair,bool> pair(valuesResult,die->isHighlighted()); - listpair.append(pair); + HighLightDice hlDice(valuesResult,die->isHighlighted(),die->getColor()); + //QPair,bool> pair(valuesResult,die->isHighlighted()); + listpair.append(hlDice); } } if(!listpair.isEmpty()) @@ -944,6 +948,15 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous, bool hasDice)/ node = mergeNode; isFine = true; + } + break; + case Painter: + { + PainterNode* painter = new PainterNode(); + m_parsingToolbox->readPainterParameter(painter,str); + previous->setNextNode(painter); + node = painter; + isFine = true; } break; case ifOperator: -- cgit v1.2.3-70-g09d2