Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

Conflicts:
	HelpMe.md
	diceparser.cpp
	parsingtoolbox.cpp
	result/result.cpp
	result/stringresult.h

8 files changed, 44 insertions, 20 deletions

diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index 998bef6..ceb77b8 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -81,12 +81,19 @@ qreal DiceResult::getScalarResult()
 
     return 0;
 }
-QString DiceResult::toString()
+QString DiceResult::toString(bool wl)
 {
     QStringList scalarSum;
     foreach(Die* die,m_diceValues)
     {
         scalarSum << QString::number(die->getValue());
     }
-    return QString("DiceResult_Value_%1_dice_%2").arg(getScalarResult()).arg(scalarSum.join('_'));
+	if(wl)
+	{
+		return QString("%3 [label=\"DiceResult Value %1 dice %2\"]").arg(getScalarResult()).arg(scalarSum.join('_')).arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
diff --git a/result/diceresult.h b/result/diceresult.h
index 07378d1..84a4621 100644
--- a/result/diceresult.h
+++ b/result/diceresult.h
@@ -65,7 +65,7 @@ public:
      * @brief toString
      * @return
      */
-    virtual QString toString();
+	virtual QString toString(bool wl);
 
 private:
     qreal getScalarResult();
diff --git a/result/result.cpp b/result/result.cpp
index 161cfea..7b6633c 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -20,9 +20,10 @@
 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
 ***************************************************************************/
 #include "result.h"
+#include <QUuid>
 
 Result::Result()
-    : m_previous(NULL),m_resultTypes(STRING)
+	: m_previous(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
 {
 }
 
@@ -47,22 +48,23 @@ bool Result::hasResultOfType(RESULT_TYPE type) const
 }
 void Result::generateDotTree(QString& s)
 {
-    s.append(toString());
+	s.append(toString(true));
+	s.append(";\n");
+
     if(NULL!=m_previous)
     {
+		s.append(toString(false));
         s.append(" -> ");
-        s.append(m_previous->toString());
-        s.append(" [label=\"previousResult\"];\n");
+		s.append(m_previous->toString(true));
+		s.append("\n");
         m_previous->generateDotTree(s);
     }
     {
+		s.append(toString(false));
         s.append(" -> ");
-        s.append("NULL");
+		s.append("NULL");
         s.append(" [label=\"previousResult\"];\n");
     }
 
 }
-/*QString Result::toString()
-{
-    return QString();
-}*/
+
diff --git a/result/result.h b/result/result.h
index 3d635bc..3f16535 100644
--- a/result/result.h
+++ b/result/result.h
@@ -77,9 +77,10 @@ public:
      * @brief toString
      * @return
      */
-    virtual QString toString() = 0;
+	virtual QString toString(bool wl) = 0;
 protected:
      int m_resultTypes;/// @brief
+     QString m_id;
 private:
     Result* m_previous;/// @brief
 
diff --git a/result/scalarresult.cpp b/result/scalarresult.cpp
index a998608..9168938 100644
--- a/result/scalarresult.cpp
+++ b/result/scalarresult.cpp
@@ -36,7 +36,14 @@ QVariant ScalarResult::getResult(Result::RESULT_TYPE type)
     return m_value;
 }
 
-QString ScalarResult::toString()
+QString ScalarResult::toString(bool wl)
 {
-    return QString("ScalarResult_Value_%1").arg(m_value);
+	if(wl)
+	{
+		return QString("%2 [label=\"ScalarResult %1\"]").arg(m_value).arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
diff --git a/result/scalarresult.h b/result/scalarresult.h
index 8a0fa11..f441c9b 100644
--- a/result/scalarresult.h
+++ b/result/scalarresult.h
@@ -49,7 +49,7 @@ public:
      * @brief toString
      * @return
      */
-    virtual QString toString();
+	virtual QString toString(bool);
 
 private:
     qreal m_value;
diff --git a/result/stringresult.cpp b/result/stringresult.cpp
index 474ae23..2dff0ac 100644
--- a/result/stringresult.cpp
+++ b/result/stringresult.cpp
@@ -32,9 +32,16 @@ QVariant StringResult::getResult(RESULT_TYPE type)
 
     return QVariant();
 }
-QString StringResult::toString()
-{
-    return QString("StringResult_value_%1").arg(getText().replace(" ","_"));
+QString StringResult::toString(bool wl)
+{
+	if(wl)
+	{
+		return QString("%2 [label=\"StringResult_value_%1\"]").arg(getText().replace(" ","_")).arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
 void StringResult::setHighLight(bool b)
 {
diff --git a/result/stringresult.h b/result/stringresult.h
index 6819aaa..cdd7de2 100644
--- a/result/stringresult.h
+++ b/result/stringresult.h
@@ -36,7 +36,7 @@ public:
      * @brief toString
      * @return
      */
-    virtual QString toString();
+    virtual QString toString(bool);
 
     virtual void setHighLight(bool );
     virtual bool hasHighLight() const;