From 2685e8e4fbbc480bbc9edf991faace7082987f38 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Tue, 9 Dec 2014 22:07:31 +0100 Subject: -New API for result type. --- diceresult.cpp | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'diceresult.cpp') diff --git a/diceresult.cpp b/diceresult.cpp index f111ad4..7b73825 100644 --- a/diceresult.cpp +++ b/diceresult.cpp @@ -23,7 +23,7 @@ DiceResult::DiceResult() { - + m_resultTypes= (DICE_LIST | SCALAR); } void DiceResult::insertResult(Die* die) { @@ -38,17 +38,36 @@ void DiceResult::setResultList(QList list) m_diceValues.clear(); m_diceValues << list; } -bool DiceResult::isScalar() const +//bool DiceResult::isScalar() const +//{ +// if(m_diceValues.size()==1) +// { +// return true; +// } +// return false; +//} +QVariant DiceResult::getResult(RESULT_TYPE type) { - if(m_diceValues.size()==1) + + switch (type) + { + case SCALAR: + return getScalarResult(); + break; + case DICE_LIST: { - return true; + + return QVariant(); + break; + } + default: + break; } - return false; + return QVariant(); + } -qreal DiceResult::getScalar() +qreal DiceResult::getScalarResult() { - if(m_diceValues.size()==1) { return m_diceValues[0]->getValue(); -- cgit v1.2.3-70-g09d2