From a039b95e2f2aebd3ce753d25fe5efa02cce387de Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 5 Nov 2007 12:03:01 +0000
Subject: [PATCH] added color as a possible parameter

---
 src/meshlab/filterparameter.cpp | 21 +++++++++++++++++++++
 src/meshlab/filterparameter.h   |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/meshlab/filterparameter.cpp b/src/meshlab/filterparameter.cpp
index 53706976d..bcdb77cbc 100644
--- a/src/meshlab/filterparameter.cpp
+++ b/src/meshlab/filterparameter.cpp
@@ -114,7 +114,28 @@ void  FilterParameterSet::setFloat(QString name, float newVal)
 }
 
 //--------------------------------------
+void  FilterParameterSet::addColor(QString name, QColor defaultVal, QString desc, QString tooltip)
+{
+	FilterParameter p(name,desc,tooltip);
+  p.fieldVal=defaultVal.rgb(); // it is converted to an unsigned int
+	p.fieldType=FilterParameter::PARCOLOR;
+	paramList.push_back(p);		
+}
+QColor FilterParameterSet::getColor(QString name)
+{
+	FilterParameter &p=findParameter(name);
+	assert(p.fieldType == FilterParameter::PARCOLOR);
+	return QColor(QRgb(p.fieldVal.toUInt()));
+}
 
+void  FilterParameterSet::setColor(QString name, QColor newVal)
+{
+	FilterParameter &p=findParameter(name);
+	assert(p.fieldType == FilterParameter::PARCOLOR);
+	p.fieldVal=QVariant(newVal.rgb());	
+}
+
+//--------------------------------------
 
 void FilterParameterSet::addString   (QString name, QString   defaultVal, QString desc, QString tooltip)
 {
diff --git a/src/meshlab/filterparameter.h b/src/meshlab/filterparameter.h
index 886e605c4..9f08b93d0 100644
--- a/src/meshlab/filterparameter.h
+++ b/src/meshlab/filterparameter.h
@@ -23,6 +23,9 @@
 /****************************************************************************
   History
 $Log$
+Revision 1.11  2007/11/05 12:03:01  cignoni
+added color as a possible parameter
+
 Revision 1.10  2007/10/24 10:34:26  ponchio
 removed extra FilterParameterSet:: in findParameter(QString name);
 
@@ -96,7 +99,8 @@ class FilterParameter
 		PARFLOAT   = 3,
 		PARSTRING  = 4,
 		PARABSPERC = 5,
-		PARMATRIX  = 6
+		PARMATRIX  = 6,
+		PARCOLOR = 7
 	};
 	
 	QString  fieldName;
@@ -131,6 +135,7 @@ public:
 	void addFloat    (QString name, float     defaultVal, QString desc=QString(), QString tooltip=QString());
 	void addString   (QString name, QString   defaultVal, QString desc=QString(), QString tooltip=QString());
 	void addMatrix44 (QString name, vcg::Matrix44f defaultVal, QString desc=QString(), QString tooltip=QString());
+	void addColor    (QString name, QColor defaultVal, QString desc=QString(), QString tooltip=QString());
   void addAbsPerc  (QString name, float     defaultVal, float minVal, float maxVal,  QString desc=QString(), QString tooltip=QString());
 		
 	bool				getBool(QString name);
@@ -138,6 +143,7 @@ public:
 	float				getFloat(QString name);
 	QString			getString(QString name);
 	vcg::Matrix44f		getMatrix44(QString name);
+	QColor		  getColor(QString name);
 	float		    getAbsPerc(QString name);
 	
 	void setBool(QString name, bool newVal) ;
@@ -145,6 +151,7 @@ public:
 	void setFloat(QString name, float newVal);
 	void setString(QString name, QString newVal);
 	void setMatrix44(QString name, vcg::Matrix44f newVal);
+	void setColor(QString name, QColor newVal);
 	void setAbsPerc(QString name, float newVal);
 
 	FilterParameter &findParameter(QString name);