aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--die.cpp5
-rw-r--r--node/executionnode.cpp2
-rw-r--r--node/listsetrollnode.cpp2
-rw-r--r--node/listsetrollnode.h2
-rw-r--r--node/mergenode.cpp26
-rw-r--r--node/scalaroperatornode.h4
-rw-r--r--operationcondition.cpp2
-rw-r--r--operationcondition.h2
-rw-r--r--parsingtoolbox.cpp23
-rw-r--r--parsingtoolbox.h17
-rw-r--r--result/result.cpp2
-rw-r--r--result/result.h2
12 files changed, 50 insertions, 39 deletions
diff --git a/die.cpp b/die.cpp
index 64bd606..64f08d6 100644
--- a/die.cpp
+++ b/die.cpp
@@ -19,14 +19,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <QDateTime>
#include "die.h"
+#include <QDateTime>
#include <QDebug>
+#include <QColor>
Die::Die()
- : m_hasValue(false),m_displayStatus(false),m_highlighted(true),m_base(1)
+ : m_hasValue(false),m_displayStatus(false),m_highlighted(true),m_base(1),m_color("")
{
uint seed = quintptr(this) + QDateTime::currentDateTime().toMSecsSinceEpoch();
qsrand(seed);
diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index c1dec73..d2f291b 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -3,7 +3,7 @@
#include <QUuid>
ExecutionNode::ExecutionNode()
- : m_nextNode(NULL),m_result(NULL),m_previousNode(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
+ : m_previousNode(NULL),m_result(NULL),m_nextNode(NULL),m_errors(QMap<ExecutionNode::DICE_ERROR_CODE,QString>()),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
{
}
diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp
index 9f15d36..7674720 100644
--- a/node/listsetrollnode.cpp
+++ b/node/listsetrollnode.cpp
@@ -35,7 +35,7 @@ ListSetRollNode::~ListSetRollNode()
}
}
-QStringList ListSetRollNode::getList()
+QStringList ListSetRollNode::getList() const
{
return m_values;
}
diff --git a/node/listsetrollnode.h b/node/listsetrollnode.h
index 5f381f5..05e7ea4 100644
--- a/node/listsetrollnode.h
+++ b/node/listsetrollnode.h
@@ -39,7 +39,7 @@ public:
virtual void run(ExecutionNode* previous = NULL);
virtual QString toString(bool)const;
virtual qint64 getPriority() const;
- QStringList getList();
+ QStringList getList() const;
void setListValue(QStringList);
void setUnique(bool );
diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index 5145bc8..7f3bec0 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -32,26 +32,26 @@ void MergeNode::run(ExecutionNode* previous)
if(NULL!=previous)
{
m_result->setPrevious(previous->getResult());
- }
- Result* tmpResult = previous->getResult();
- while(NULL!=tmpResult)
- {
- DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult);
- if(NULL!=dice)
+
+ Result* tmpResult = previous->getResult();
+ while(NULL!=tmpResult)
{
- ///@todo improve here to set homogeneous while is really
- m_diceResult->setHomogeneous(false);
- foreach(Die* die, dice->getResultList())
+ DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult);
+ if(NULL!=dice)
{
- if(!m_diceResult->getResultList().contains(die))
+ ///@todo improve here to set homogeneous while is really
+ m_diceResult->setHomogeneous(false);
+ foreach(Die* die, dice->getResultList())
{
- m_diceResult->getResultList().append(die);
+ if(!m_diceResult->getResultList().contains(die))
+ {
+ m_diceResult->getResultList().append(die);
+ }
}
}
+ tmpResult = tmpResult->getPrevious();
}
- tmpResult = tmpResult->getPrevious();
}
-
if(NULL!=m_nextNode)
{
m_nextNode->run(this);
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index 06f121b..fccc5e5 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -62,9 +62,9 @@ private:
static qint64 multiple(qint64,qint64);
private:
- ArithmeticOperator m_arithmeticOperator;
- ScalarResult* m_scalarResult;
ExecutionNode* m_internalNode;
+ ScalarResult* m_scalarResult;
+ ArithmeticOperator m_arithmeticOperator;
};
#endif // SCALAROPERATORNODE_H
diff --git a/operationcondition.cpp b/operationcondition.cpp
index 121bd1e..bcc1b75 100644
--- a/operationcondition.cpp
+++ b/operationcondition.cpp
@@ -21,7 +21,7 @@
#include "operationcondition.h"
OperationCondition::OperationCondition()
- : m_operator(Modulo)
+ : m_operator(Modulo),m_boolean(NULL),m_value(0)
{
}
diff --git a/operationcondition.h b/operationcondition.h
index 5d7510c..0c049a0 100644
--- a/operationcondition.h
+++ b/operationcondition.h
@@ -39,7 +39,7 @@ public:
virtual quint64 getValidRangeSize(quint64 faces) const;
- BooleanCondition *getBoolean() const;
+ BooleanCondition* getBoolean() const;
void setBoolean(BooleanCondition *boolean);
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 387b635..1c9dc90 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -53,6 +53,19 @@ ParsingToolBox::ParsingToolBox()
m_arithmeticOperation->insert(QStringLiteral("÷"),ScalarOperatorNode::DIVIDE);
}
+
+ParsingToolBox::ParsingToolBox(const ParsingToolBox& data)
+{
+
+}
+ParsingToolBox::~ParsingToolBox()
+{
+ if(NULL!=m_logicOp)
+ {
+ delete m_logicOp;
+ m_logicOp = NULL;
+ }
+}
ExecutionNode* ParsingToolBox::addSort(ExecutionNode* e,bool b)
{
SortResultNode* nodeSort = new SortResultNode();
@@ -122,19 +135,11 @@ bool ParsingToolBox::readLogicOperator(QString& str,BooleanCondition::LogicOpera
return false;
}
-ParsingToolBox::~ParsingToolBox()
-{
- if(NULL!=m_logicOp)
- {
- delete m_logicOp;
- m_logicOp = NULL;
- }
-}
Validator* ParsingToolBox::readValidator(QString& str)
{
Validator* returnVal=NULL;
BooleanCondition::LogicOperator myLogicOp = BooleanCondition::Equal;
- bool hasReadLogicOperator = readLogicOperator(str,myLogicOp);
+ /*bool hasReadLogicOperator = */readLogicOperator(str,myLogicOp);
OperationCondition::ConditionOperator condiOp = OperationCondition::Modulo;
diff --git a/parsingtoolbox.h b/parsingtoolbox.h
index 8c80d13..4aeb16e 100644
--- a/parsingtoolbox.h
+++ b/parsingtoolbox.h
@@ -45,6 +45,11 @@ public:
* @brief ParsingToolBox
*/
ParsingToolBox();
+ /**
+ * @brief ParsingToolBox
+ * @param data
+ */
+ ParsingToolBox(const ParsingToolBox & data);
/**
* @brief ~ParsingToolBox
*/
@@ -61,7 +66,7 @@ public:
* @param str
* @return
*/
- bool readAscending(QString& str);
+ static bool readAscending(QString& str);
/**
* @brief readLogicOperator
* @param str
@@ -88,7 +93,7 @@ public:
* @param myNumber reference to the found number
* @return true, succeed to read number, false otherwise.
*/
- bool readNumber(QString& str, qint64& myNumber);
+ static bool readNumber(QString& str, qint64& myNumber);
/**
@@ -96,13 +101,13 @@ public:
* @param str
* @return
*/
- bool readOpenParentheses(QString& str);
+ static bool readOpenParentheses(QString& str);
/**
* @brief readCloseParentheses
* @param str
* @return
*/
- bool readCloseParentheses(QString& str);
+ static bool readCloseParentheses(QString& str);
/**
* @brief readList
@@ -138,7 +143,7 @@ public:
* @param str
* @return
*/
- LIST_OPERATOR readListOperator(QString& str);
+ static LIST_OPERATOR readListOperator(QString& str);
void readProbability(QStringList& str,QList<Range>& ranges);
@@ -148,7 +153,7 @@ public:
bool readArithmeticOperator(QString& str, ScalarOperatorNode::ArithmeticOperator& op);
- void readPainterParameter(PainterNode *painter, QString &str);
+ static void readPainterParameter(PainterNode *painter, QString &str);
private:
QMap<QString,BooleanCondition::LogicOperator>* m_logicOp;
QMap<QString,CompositeValidator::LogicOperation>* m_logicOperation;
diff --git a/result/result.cpp b/result/result.cpp
index 163d539..10056aa 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -23,7 +23,7 @@
#include <QUuid>
Result::Result()
- : m_previous(NULL),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
+ : m_previous(NULL),m_resultTypes(NONE),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
{
}
diff --git a/result/result.h b/result/result.h
index 2a5b7f9..efadbb2 100644
--- a/result/result.h
+++ b/result/result.h
@@ -34,7 +34,7 @@ public:
/**
* @brief The RESULT_TYPE enum or combinaison
*/
- enum RESULT_TYPE {SCALAR=1,STRING=2,DICE_LIST=4};
+ enum RESULT_TYPE {NONE=0,SCALAR=1,STRING=2,DICE_LIST=4};
/**
* @brief Result
*/