stapjes

CommonData/filter.cpp

@@ -79,8 +79,7 @@ void Filter::dbLoad()
 	if(oldConstructorJson	!= _constructorJson)	_constructorJsonChanged();
 	if(oldConstructorR		!= _constructorR)		_constructorRChanged();
 
-	db().filterSelect(_id, _filtered);
-	calculateFilteredRowCount();
+	dbLoadResultAndError();
 
 	db().transactionReadEnd();
 }
@@ -124,15 +123,18 @@ void Filter::setRowCount(size_t rows)
 	_filtered.resize(rows);
 }
 
-bool Filter::dbLoadResultAndError()
+void Filter::dbLoadResultAndError()
 {
 	assert(_id != -1);
 
 	_errorMsg = db().filterLoadErrorMsg(_id);
-	 bool changed = db().filterSelect(_id, _filtered);
 
+	 if(db().filterSelect(_id, _filtered))
+		_filteredChanged(); 
+
 	 calculateFilteredRowCount();
-	 return changed;
+
+
 }
 
 void Filter::dbDelete()

CommonData/filter.h

@@ -61,7 +61,7 @@ class Filter : public DataSetBaseNode
 	void						dbUpdate();
 	void						dbUpdateErrorMsg();
 	void						dbLoad();
-	bool						dbLoadResultAndError();					///< Loads (updated) filtervalues from database and the (possible) error msg, returns true if an error is set
+
 	void						dbDelete();
 	void						incRevision() override;
 	bool						checkForUpdates();
@@ -76,8 +76,9 @@ class Filter : public DataSetBaseNode
 
 	DatabaseInterface		&	db();
 	const DatabaseInterface	&	db() const;
-
+	
 protected:
+	void						dbLoadResultAndError();					///< Loads (updated) filtervalues from database and the (possible) error msg, returns true if an error is set
 	void						calculateFilteredRowCount();
 	void						rescanForColumns();
 

Desktop/data/filtermodel.cpp

@@ -22,19 +22,19 @@ QString FilterModel::constructorJson()	const	{ return !filter() ? DEFAULT_FILTER
 void FilterModel::applyConstructorJson(QString newConstructorJson)
 {
 	if (newConstructorJson != constructorJson())
-		_undoStack->pushCommand(new SetJsonFilterCommand(filter(), newConstructorJson));
+		UndoStack::singleton()->pushCommand(new SetJsonFilterCommand(filter(), newConstructorJson));
 }
 
 void FilterModel::applyRFilter(QString newRFilter)
 {
 	if (newRFilter != rFilter())
-		_undoStack->pushCommand(new SetRFilterCommand(filter(), newRFilter));
+		UndoStack::singleton()->pushCommand(new SetRFilterCommand(filter(), newRFilter));
 }
 
 
 void FilterModel::processFilterResult()
 {
-	if(filter())
+	if(!filter())
 		return;
 
 	//Load new filter values from database