Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

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

1 files changed, 9 insertions, 2 deletions

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;
+	}
 }