add properties to column

Author: JorisGoosen

CommonData/column.cpp

@@ -174,6 +174,13 @@ void Column::setTitle(const std::string &title)
 	_title = _name != title ? title : "";
 	db().columnSetTitle(_id, _title);
 	incRevision();
+	
+	emit titleChanged();
+}
+
+void Column::setTitleQ(const QString &title)
+{
+	setTitle(fq(title));
 }
 
 void Column::setDescription(const std::string &description)
@@ -186,6 +193,13 @@ void Column::setDescription(const std::string &description)
 	_description = description;
 	db().columnSetDescription(_id, _description);
 	incRevision();
+	
+	emit descriptionChanged();
+}
+
+void Column::setDescriptionQ(const QString &description)
+{
+	setDescription(fq(description));
 }
 
 void Column::setComputeFilter(const std::string &filter)
@@ -292,6 +306,8 @@ void Column::setCodeType(computedColumnType codeType)
 	_codeType	= codeType;
 
 	dbUpdateComputedColumnStuff();
+	
+	emit codeTypeChanged();
 }
 
 bool Column::setConstructorJson(const std::string & constructorJson)
@@ -348,9 +364,16 @@ bool Column::setRCode(const std::string & rCode)
 
 	dbUpdateComputedColumnStuff();
 
+	emit rCodeChanged();
+	
 	return true;
 }
 
+bool Column::setRCodeQ(const QString &rCode)
+{
+	return setRCode(fq(rCode));
+}
+
 bool Column::setError(const std::string & error)
 {
 	JASPTIMER_SCOPE(Column::setError);
@@ -1958,6 +1981,21 @@ const QString Column::nameQ() const
 	return tq(name());
 }
 
+const QString Column::titleQ() const
+{
+	return tq(title());
+}
+
+const QString Column::rCodeQ() const
+{
+	return tq(rCode());
+}
+
+const QString Column::descriptionQ() const
+{
+	return tq(description());
+}
+
 void Column::upgradeSetDoubleLabelsInInts()
 {
 	throw std::runtime_error("Do something about this!");

CommonData/column.h

@@ -43,7 +43,12 @@ class Column : public DataSetBaseNode
 {
 	Q_OBJECT
 
-	Q_PROPERTY(QString name READ nameQ WRITE setNameQ NOTIFY nameChanged)
+	Q_PROPERTY(QString				name		READ nameQ		WRITE setNameQ		NOTIFY nameChanged		)
+	Q_PROPERTY(QString				title		READ titleQ		WRITE setTitleQ		NOTIFY titleChanged		)
+	Q_PROPERTY(QString				rcode		READ rCodeQ		WRITE setRCodeQ		NOTIFY rCodeChanged		)
+	Q_PROPERTY(columnType			colType		READ type		WRITE setType		NOTIFY columnTypeChanged	)
+	Q_PROPERTY(computedColumnType	codeType	READ codeType	WRITE setCodeType	NOTIFY codeTypeChanged	)
+	
 
 	friend DatabaseInterface;
 public:
@@ -87,12 +92,15 @@ class Column : public DataSetBaseNode
 			bool					setName(			const std::string & name			);
 			bool					setNameQ(			const QString	  & name			);
 			void					setTitle(			const std::string & title			);
+			void					setTitleQ(			const QString	  & title			);
 			bool					setRCode(			const std::string & rCode			);
+			bool					setRCodeQ(			const QString	  & rCode			);
 			bool					setError(			const std::string & error			);
 			void					setType(			columnType			colType			);
 			columnTypeChangeResult	changeType(			columnType			colType			);
 			void					setCodeType(		computedColumnType	codeType		);
 			void					setDescription(		const std::string & description		);
+			void					setDescriptionQ(	const QString	  & description		);
 			void					setComputeFilter(	const std::string & filter = ""		);
 			bool					setConstructorJson(	const Json::Value & constructorJson	);
 			bool					setConstructorJson(	const std::string & constructorJson	);
@@ -129,6 +137,9 @@ class Column : public DataSetBaseNode
 			computedColumnType		codeType()				const	{ return _codeType;			}
 			const std::string	&	name()					const	{ return _name;				}
 			const QString			nameQ()					const;
+			const QString			titleQ()				const;
+			const QString			rCodeQ()				const;
+			const QString			descriptionQ()			const;			
 			const std::string	&	title()					const	{ return _title.empty() ? _name : _title;	}
 			const std::string	&	error()					const	{ return _error;			}
 			const std::string	&	rCode()					const	{ return _rCode;			}
@@ -292,6 +303,10 @@ class Column : public DataSetBaseNode
 			void					labelFilterChanged();
 			void					showWarning(						QString title, QString msg);
 			void					nameChanged();
+			void					titleChanged();
+			void					rCodeChanged();
+			void					descriptionChanged();
+			void					codeTypeChanged();
 
 private:
 			DataSet			* const	_data;

Desktop/data/computedcolumnmodel.cpp

@@ -257,8 +257,6 @@ void ComputedColumnModel::computeColumnSucceeded(QString columnNameQ, QString wa
 
 	if(dataChanged)
 		checkForDependentColumnsToBeSent(columnNameQ);
-	
-	DataSetPackage::pkg()->labelFilterChanged(); //in case the user had enabled some labelfilter on the computed column?
 }
 
 void ComputedColumnModel::computeColumnFailed(QString columnNameQ, QString errorQ)

Desktop/data/datasetpackage.cpp

@@ -148,7 +148,6 @@ void DataSetPackage::connectDataSet()
 	connect(_dataSet, &DataSet::labelsReordered,		this, &DataSetPackage::labelsReordered		);
 	connect(_dataSet, &DataSet::columnTypeChanged,		this, &DataSetPackage::columnDataTypeChanged, Qt::QueuedConnection); //Avoid calling setCurrentColumnNames in columnEncoder too often when there are many many columns 
 	connect(_dataSet, &DataSet::columnsBeingRemoved,	this, &DataSetPackage::columnsBeingRemoved	);
-	connect(_dataSet, &DataSet::labelFilterChanged,		this, &DataSetPackage::labelFilterChanged	);
 	connect(_dataSet, &DataSet::somethingModified,		this, &DataSetPackage::enableModified		);
 	connect(_dataSet, &DataSet::dataModeChanged,		this, &DataSetPackage::dataModeChanged		);
 	connect(_dataSet, &DataSet::sendFilter,				this, &DataSetPackage::sendFilter			);

Desktop/data/datasetpackage.h

@@ -262,7 +262,6 @@ class DataSetPackage : public QObject
 				void				runFilter();
 				void				badDataEntered(const QModelIndex index);
 				void				allFiltersReset();
-				void				labelFilterChanged();
 				void				labelChanged(			QString columnName, QString originalLabel, QString newLabel);
 				void				columnDataTypeChanged(	QString columnName);
 				void				labelsReordered(		QString columnName);