add new validator for support several condition in one operator

3 files changed, 204 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8b4c5c..9aae367 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ add_executable(
     range.cpp 
     booleancondition.cpp 
     validator.cpp 
+    compositevalidator.cpp
     die.cpp 
     parsingtoolbox.cpp 
     dicealias.cpp
diff --git a/compositevalidator.cpp b/compositevalidator.cpp
new file mode 100644
index 0000000..0715ba2
--- /dev/null
+++ b/compositevalidator.cpp
@@ -0,0 +1,149 @@
+/***************************************************************************
+* Copyright (C) 2014 by Renaud Guezennec                                   *
+* http://renaudguezennec.homelinux.org/accueil,3.html                      *
+*                                                                          *
+*  This file is part of DiceParser                                         *
+*                                                                          *
+* DiceParser is free software; you can redistribute it and/or modify       *
+* it under the terms of the GNU General Public License as published by     *
+* the Free Software Foundation; either version 2 of the License, or        *
+* (at your option) any later version.                                      *
+*                                                                          *
+* This program is distributed in the hope that it will be useful,          *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             *
+* GNU General Public License for more details.                             *
+*                                                                          *
+* You should have received a copy of the GNU General Public License        *
+* along with this program; if not, write to the                            *
+* Free Software Foundation, Inc.,                                          *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
+***************************************************************************/
+#include "compositevalidator.h"
+
+
+CompositeValidator::BooleanCondition()
+{
+}
+qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) const
+{
+
+	int i = 0;
+	qint64 sum = 0;
+	foreach(Validator* validator, m_validatorList)
+	{
+		qint64 val = validator->hasValid(b,recursive,unhighlight);
+		if(i==0)
+		{
+			sum = val;
+		}
+		else
+		{
+			switch(m_operators[i-1])
+			{
+				case OR:
+					sum |= val;
+				break;
+				case EXCLUSIVE_OR:
+					sum ^= val;/// @todo may required to be done by hand
+				break;
+				case AND:
+					sum &= val;
+				break;
+			}
+		}
+		++i;
+	}
+
+	/*QList<qint64> listValues;
+	if(recursive)
+	{
+		listValues = b->getListValue();
+	}
+	else
+	{
+		listValues.append(b->getLastRolledValue());
+	}
+
+	qint64 sum= 0;
+	foreach(qint64 value, listValues)
+	{
+		switch(m_operator)
+		{
+			case Equal:
+				sum+=(value==m_value)?1:0;
+				break;
+			case GreaterThan:
+				sum+= (value>m_value)?1:0;
+				break;
+			case LesserThan:
+				sum+= (value<m_value)?1:0;
+				break;
+			case GreaterOrEqual:
+				sum+= (value>=m_value)?1:0;
+				break;
+			case LesserOrEqual:
+				sum+= (value<=m_value)?1:0;
+				break;
+		}
+	}
+	if((unhighlight)&&(sum==0))
+	{
+		b->setHighlighted(false);
+	}
+	else
+	{
+		 b->setHighlighted(true);
+	}
+
+	return sum;*/
+}
+
+void CompositeValidator::setOperator(LogicOperator m)
+{
+	m_operator = m;
+}
+
+void CompositeValidator::setValue(qint64 v)
+{
+	m_value=v;
+}
+QString CompositeValidator::toString()
+{
+	QString str="";
+	switch (m_operator)
+	{
+	case Equal:
+		str.append("=");
+		break;
+	case GreaterThan:
+		str.append(">");
+		break;
+	case LesserThan:
+		str.append("<");
+		break;
+	case GreaterOrEqual:
+		str.append(">=");
+		break;
+	case LesserOrEqual:
+		str.append("<=");
+		break;
+	}
+	return QString("[%1%2]").arg(str).arg(m_value);
+}
+quint8 CompositeValidator::getValidRangeSize(quint64 faces) const
+{
+	switch (m_operator)
+	{
+	case Equal:
+		return 1;
+	case GreaterThan:
+		return faces-m_value;
+	case LesserThan:
+		return m_value-1;
+	case GreaterOrEqual:
+		return faces-(m_value-1);
+	case LesserOrEqual:
+		return m_value;
+	}
+}
diff --git a/compositevalidator.h b/compositevalidator.h
new file mode 100644
index 0000000..b207db9
--- /dev/null
+++ b/compositevalidator.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+* Copyright (C) 2014 by Renaud Guezennec                                   *
+* http://renaudguezennec.homelinux.org/accueil,3.html                      *
+*                                                                          *
+*  This file is part of DiceParser                                         *
+*                                                                          *
+* DiceParser is free software; you can redistribute it and/or modify       *
+* it under the terms of the GNU General Public License as published by     *
+* the Free Software Foundation; either version 2 of the License, or        *
+* (at your option) any later version.                                      *
+*                                                                          *
+* This program is distributed in the hope that it will be useful,          *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             *
+* GNU General Public License for more details.                             *
+*                                                                          *
+* You should have received a copy of the GNU General Public License        *
+* along with this program; if not, write to the                            *
+* Free Software Foundation, Inc.,                                          *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
+***************************************************************************/
+#ifndef COMPOSITEVALIDATOR_H
+#define COMPOSITEVALIDATOR_H
+
+#include <QString>
+#include <QVector>
+#include <Qt>
+
+#include "validator.h"
+/**
+ * @brief The BooleanCondition class is a Validator class checking validity from logic expression.
+ * It manages many operators (see : @ref LogicOperator).
+ */
+class CompositeValidator : public Validator
+{
+public:
+	enum LogicOperation { OR, EXCLUSIVE_OR , AND};
+	CompositeValidator();
+
+	virtual qint64 hasValid(Die* b,bool recursive, bool unhighlight = false) const;
+
+	void addOperation(LogicOperation m);
+	void setValue(qint64);
+	QString toString();
+
+	virtual quint8 getValidRangeSize(quint64 faces) const;
+
+private:
+	QVector<LogicOperation> m_operators;
+	qint64 m_value;
+	QList<Validator*> m_validatorList;
+};
+
+#endif // BOOLEANCONDITION_H