diff options
| author | 2016-11-03 17:36:21 +0100 | |
|---|---|---|
| committer | 2016-11-03 17:36:21 +0100 | |
| commit | 9d389e561339e4fd7a68d60f593ad233e3941d13 (patch) | |
| tree | 39e98d9d3a612be9c6cf449f5a7a5dfdf4593865 /result | |
| parent | 120add8ca2f3a7e075b415a611bcd09034bd6200 (diff) | |
| download | OneRoll-9d389e561339e4fd7a68d60f593ad233e3941d13.tar.gz OneRoll-9d389e561339e4fd7a68d60f593ad233e3941d13.zip | |
-Add FilterNode to dice system.
Diffstat (limited to 'result')
| -rw-r--r-- | result/stringresult.cpp | 19 | ||||
| -rw-r--r-- | result/stringresult.h | 1 |
2 files changed, 18 insertions, 2 deletions
diff --git a/result/stringresult.cpp b/result/stringresult.cpp index 2dff0ac..be8050d 100644 --- a/result/stringresult.cpp +++ b/result/stringresult.cpp @@ -13,7 +13,21 @@ StringResult::~StringResult() { } +bool StringResult::hasResultOfType(RESULT_TYPE resultType) const +{ + if(resultType & Result::STRING) + { + return true; + } + else if(resultType & Result::SCALAR) + { + bool ok=false; + getText().toInt(&ok); + return ok; + } + return false; +} QString StringResult::getText() const { return m_value; @@ -26,10 +40,11 @@ QVariant StringResult::getResult(RESULT_TYPE type) case STRING: return getText(); break; + case SCALAR: + return getText().toInt(); + break; } - - return QVariant(); } QString StringResult::toString(bool wl) diff --git a/result/stringresult.h b/result/stringresult.h index cdd7de2..2effea7 100644 --- a/result/stringresult.h +++ b/result/stringresult.h @@ -40,6 +40,7 @@ public: virtual void setHighLight(bool ); virtual bool hasHighLight() const; + virtual bool hasResultOfType(RESULT_TYPE resultType) const; private: QString m_value; bool m_highlight; |