make filtertext better and translateable as mentioned here: jasp-stats/jasp-issues#2515 (comment)

ctrl/cmd+enter should run r code
also adds is.na to constructors

just replace the DEFAULT_FILTER define with the correct function calls and see what happens

make filter error show up again...

fix statusbar jasp-stats/INTERNAL-jasp#2462

slightly less computersciency tooltip

Author: JorisGoosen

CommonData/filter.h

@@ -6,10 +6,10 @@
 #include <vector>
 #include "utils.h"
 
-#define DEFAULT_FILTER		"# Add filters using R syntax here, see info button for help.\n\ngeneratedFilter # by default: pass the non-R filter(s)"
 #define DEFAULT_FILTER_JSON	"{\"formulas\":[]}"
 #define DEFAULT_FILTER_GEN	"generatedFilter <- rep(TRUE, rowcount)"
 
+
 class DataSet;
 class DatabaseInterface;
 
@@ -61,9 +61,9 @@ class Filter : public DataSetBaseNode
 	DataSet				*	_data				= nullptr;
 	int						_id					= -1,
 							_filteredRowCount	= 0;
-	std::string				_rFilter			= DEFAULT_FILTER,
-							_generatedFilter	= DEFAULT_FILTER_GEN,
-							_constructorJson	= DEFAULT_FILTER_JSON,
+	std::string				_rFilter			= "",
+							_generatedFilter	= "",
+							_constructorJson	= "",
 							_constructorR		= "",
 							_errorMsg			= "";
 	std::vector<bool>		_filtered;

Desktop/components/JASP/Widgets/ComputeColumnWindow.qml

@@ -121,6 +121,17 @@ FocusScope
 					property bool changed:	text != computedColumnsInterface.computeColumnRCode
 
 					KeyNavigation.tab:		applyComputedColumnButton
+
+
+					Keys.onReturnPressed:	(keyEvent) => {
+												if(keyEvent.modifiers & Qt.ControlModifier)
+												{
+													if(changedSinceLastApply)
+														computedColumnContainer.applyComputedColumn()
+												}
+												else
+													keyEvent.accepted = false
+											}
 				}
 
 
@@ -190,6 +201,7 @@ FocusScope
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "replaceNA";		functionParameters: "column,replaceWith";	functionParamTypes: "string:boolean:number,string:boolean:number";              toolTip: qsTr("replace any missing values (NA) in column by the value in replaceWith") }
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "ifElse";			functionParameters: "test,then,else";		functionParamTypes: "boolean,boolean:string:number,boolean:string:number";      toolTip: qsTr("if-else statement") }
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "hasSubstring";	functionParameters: "string,substring";		functionParamTypes: "string,string";											toolTip: qsTr("returns true if string contains substring at least once") }
+					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "is.na";			functionParameters: "y";					functionParamTypes: "string:number:boolean";									toolTip: qsTr("returns a boolean vector with TRUE for each missing value in y") }
 
 					ListElement	{ type: "separator" }
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "normalDist";     functionParameters: "mean,sd";                  functionParamTypes: "number,number";            toolTip: qsTr("generates data from a Gaussian distribution with specified mean and standard deviation sd") }

Desktop/components/JASP/Widgets/FilterConstructor/DropSpot.qml

@@ -56,7 +56,7 @@ DropArea {
 		return false
 	}
 
-	onEntered:
+	onEntered: (drag)=>
 	{
 		//console.log(__debugName," onEntered DROPSPOT")
 

Desktop/components/JASP/Widgets/FilterConstructor/FilterConstructor.qml

@@ -242,7 +242,7 @@ Item
 				MouseArea
 				{
 					anchors.fill: parent
-					onPressed: { scriptColumn.focus = true; mouse.accepted = false; }
+					onPressed: (mouse) => { scriptColumn.focus = true; mouse.accepted = false; }
 				}
 
 				DropTrash

Desktop/components/JASP/Widgets/FilterConstructor/Function.qml

@@ -18,7 +18,7 @@ Item
 	property variant functionNameToImageSource: { "sum": jaspTheme.iconPath + "/sum.png", "prod": jaspTheme.iconPath + "/product.png", "sd": jaspTheme.iconPath + "/sigma.png", "var": jaspTheme.iconPath + "/variance.png", "!": jaspTheme.iconPath + "/negative.png", "sqrt":jaspTheme.iconPath + "/rootHead.png"}
 	property string functionImageSource: functionNameToImageSource[functionName] !== undefined ? functionNameToImageSource[functionName] : ""
 	property bool isNested: false
-	property var booleanReturningFunctions: ["!", "hasSubstring"]
+	property var booleanReturningFunctions: ["!", "hasSubstring", "is.na"]
 
 	readonly property bool isIfElse: functionName === "ifelse"
 	property var ifElseReturn: ["string", "number", "boolean"]

Desktop/components/JASP/Widgets/FilterWindow.qml

@@ -128,6 +128,7 @@ FocusScope
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "median";			functionParameters: "values";			functionParamTypes: "number";												toolTip: qsTr("median") }
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "ifelse";			functionParameters: "test,then,else";	functionParamTypes: "boolean,boolean:string:number,boolean:string:number";		toolTip: qsTr("if-else statement") }
 					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "hasSubstring";	functionParameters: "string,substring";	functionParamTypes: "string,string";											toolTip: qsTr("returns true if string contains substring at least once") }
+					ListElement	{ type: "function";	friendlyFunctionName:	"";				functionName: "is.na";			functionParameters: "y";				functionParamTypes: "string:number:boolean";									toolTip: qsTr("Combine with not-operator to filter out rows with missing values (NA) for a column.") }
 				}
 
 				function askIfChanged(closeFunc)
@@ -358,6 +359,16 @@ FocusScope
 
 							property bool changedSinceLastApply: text !== filterModel.rFilter
 
+							Keys.onReturnPressed:	(keyEvent) => {
+														if(keyEvent.modifiers & Qt.ControlModifier)
+														{
+															if(filterEdit.changedSinceLastApply)
+																filterWindow.applyAndSendFilter(filterEdit.text)
+														}
+														else
+															keyEvent.accepted = false
+													}
+
 							anchors
 							{
 								top:	parent.top

Desktop/data/filtermodel.cpp

@@ -19,11 +19,22 @@ QString FilterModel::filterErrorMsg()	const	{ return !DataSetPackage::filter() ?
 QString FilterModel::generatedFilter()	const	{ return !DataSetPackage::filter() ? "" : tq(DataSetPackage::filter()->generatedFilter());			}
 QString FilterModel::constructorJson()	const	{ return !DataSetPackage::filter() ? "" : tq(DataSetPackage::filter()->constructorJson());			}
 
+const char * FilterModel::defaultRFilter()
+{
+	static std::string defaultFilter;
+	defaultFilter = tr(	"# Add filters using R syntax here. By default the non-R filter(s) are passed with generatedFilter."		"\n"
+						"# To include generated filters, append clauses with \"&\": generatedFilter & ..."									"\n"
+						"# Click the (i) icon in the lower right corner for further help."													"\n\n"
+						"generatedFilter"	).toStdString();
+
+	return defaultFilter.c_str();
+}
+
 void FilterModel::reset()
 {
 	_setGeneratedFilter(DEFAULT_FILTER_GEN	);
 	setConstructorJson(	DEFAULT_FILTER_JSON	);
-	_setRFilter(		DEFAULT_FILTER		);
+	_setRFilter(		defaultRFilter()		);
 
 	if(DataSetPackage::pkg()->rowCount() > 0)
 		sendGeneratedAndRFilter();
@@ -191,19 +202,16 @@ void FilterModel::updateStatusBar()
 {
 	if(!DataSetPackage::pkg()->hasDataSet())
 	{
-		setStatusBarText("No data loaded!");
+		setStatusBarText(tr("No data loaded!"));
 		return;
 	}
 
-	int     TotalCount			= DataSetPackage::pkg()->rowCount(),
+	int     TotalCount			= DataSetPackage::pkg()->dataRowCount(),
 	        TotalThroughFilter	= DataSetPackage::pkg()->filteredRowCount();
-	double	PercentageThrough	= 100.0 * ((double)TotalThroughFilter) / ((double)TotalCount);
-
-	std::stringstream ss;
-	if(hasFilter())
-		ss << "Data has " << TotalCount << " rows, " << TotalThroughFilter << " (~" << (int)round(PercentageThrough) << "%)  passed through filter";
+	int		PercentageThrough	= (int)round(100.0 * ((double)TotalThroughFilter) / ((double)TotalCount));
+	bool	Approximate			= PercentageThrough != TotalThroughFilter;
 
-	setStatusBarText(tq(ss.str()));
+	setStatusBarText(tr("Data has %1 rows, %2 (%3%4%) passed through filter").arg(TotalCount).arg(TotalThroughFilter).arg(Approximate ? "~" : "").arg(PercentageThrough));
 }
 
 void FilterModel::rescanRFilterForColumns()

Desktop/data/filtermodel.h

@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include "utilities/qutils.h"
-#include "datasetpackage.h"
 #include "labelfiltergenerator.h"
 
 ///
@@ -22,27 +21,27 @@ class FilterModel : public QObject
 	Q_PROPERTY( QString defaultRFilter		READ defaultRFilter									NOTIFY defaultRFilterChanged	)
 
 public:
-	explicit FilterModel(labelFilterGenerator * labelfilterGenerator);
+	explicit					FilterModel(labelFilterGenerator * labelfilterGenerator);
 
-	void init();
+				void			init();
 
-	QString rFilter()				const;
-	QString constructorR()			const;
-	QString statusBarText()			const	{ return _statusBarText;			}
-	QString filterErrorMsg()		const;
-	QString generatedFilter()		const;
-	QString constructorJson()		const;
-	QString defaultRFilter()		const	{ return DEFAULT_FILTER;			}
+				QString			rFilter()				const;
+				QString			constructorR()			const;
+				QString			statusBarText()			const	{ return _statusBarText;			}
+				QString			filterErrorMsg()		const;
+				QString			generatedFilter()		const;
+				QString			constructorJson()		const;
+	static		const char *	defaultRFilter();
 
-	bool	hasFilter()				const	{ return rFilter() != DEFAULT_FILTER || constructorJson() != DEFAULT_FILTER_JSON; }
+				bool			hasFilter()				const	{ return rFilter() != defaultRFilter() || constructorJson() != DEFAULT_FILTER_JSON; }
 
 
-	Q_INVOKABLE void resetRFilter()				{ applyRFilter(DEFAULT_FILTER); }
-	void		sendGeneratedAndRFilter();
+	Q_INVOKABLE void			resetRFilter()				{ applyRFilter(defaultRFilter()); }
+				void			sendGeneratedAndRFilter();
 
-	void updateStatusBar();
-	void reset();
-	void modelInit();
+				void			updateStatusBar();
+				void			reset();
+				void			modelInit();
 
 public slots:
 	GENERIC_SET_FUNCTION(StatusBarText,			_statusBarText,			statusBarTextChanged,		QString)

Desktop/data/importers/jaspimporterold.cpp

@@ -16,7 +16,7 @@
 //
 
 #include "jaspimporterold.h"
-#include "columnutils.h"
+#include "data/filtermodel.h"
 #include <fstream>
 
 #include <sys/stat.h>
@@ -106,7 +106,7 @@ void JASPImporterOld::loadDataArchive_1_00(const std::string &path, std::functio
 
 	packageData->dataSet()->setDataFileSynch(true);
 
-	DataSetPackage::filter()->setRFilter(	metaData.get("filterData",			DEFAULT_FILTER)	.asString());
+	DataSetPackage::filter()->setRFilter(	metaData.get("filterData",			FilterModel::defaultRFilter())	.asString());
 
 	Json::Value jsonFilterConstructor = metaData.get("filterConstructorJSON", DEFAULT_FILTER_JSON);
 	DataSetPackage::filter()->setConstructorJson(jsonFilterConstructor.isObject() ? jsonFilterConstructor.toStyledString() : jsonFilterConstructor.asString());
@@ -229,8 +229,8 @@ void JASPImporterOld::loadDataArchive_1_00(const std::string &path, std::functio
 	//Filter should be run if filterVector was not filled and either of the filters was different from default.
 	bool filterShouldBeRun =
 			filterVector.size() == 0 &&
-			(	metaData.get("filterData",				DEFAULT_FILTER).asString()		!= DEFAULT_FILTER
-			||	metaData.get("filterConstructorJSON",	DEFAULT_FILTER_JSON).asString() != DEFAULT_FILTER_JSON	);
+			(	metaData.get("filterData",				FilterModel::defaultRFilter()).asString()	!= FilterModel::defaultRFilter()
+			||	metaData.get("filterConstructorJSON",	DEFAULT_FILTER_JSON).asString()				!= DEFAULT_FILTER_JSON	);
 
 	packageData->setFilterShouldRunInit(filterShouldBeRun);
 }

Desktop/data/labelfiltergenerator.cpp

@@ -1,4 +1,5 @@
 #include "labelfiltergenerator.h"
+#include "filtermodel.h"
 
 labelFilterGenerator::labelFilterGenerator(ColumnModel *columnModel, QObject *parent)
 	: QObject(parent), _columnModel(columnModel)

Desktop/engine/enginerepresentation.cpp

@@ -342,6 +342,7 @@ void EngineRepresentation::processFilterReply(Json::Value & json)
 {
 	checkIfExpectedReplyType(engineState::filter);
 
+
 	setState(engineState::idle);
 
 #ifdef PRINT_ENGINE_MESSAGES
@@ -350,10 +351,15 @@ void EngineRepresentation::processFilterReply(Json::Value & json)
 
 	int requestId = json.get("requestId", -1).asInt();
 
-	emit filterDone(requestId);
-
 	if(requestId == _lastRequestId)
-		emit processNewFilterResult(requestId);
+	{
+		emit filterDone(requestId);
+
+		if(json.isMember("error"))
+			emit processFilterErrorMsg(tq(json["error"].asString()), requestId);
+		else
+			emit processNewFilterResult(requestId);
+	}
 }
 
 void EngineRepresentation::runScriptOnProcess(const QString & rCmdCode)

Engine/engine.cpp

@@ -300,6 +300,8 @@ void Engine::runFilter(const std::string & filter, const std::string & generated
 		std::vector<bool> filterResult	= rbridge_applyFilter(strippedFilter, generatedFilter);
 		std::string RPossibleWarning	= jaspRCPP_getLastErrorMsg();
 
+		Log::log() << "Engine::runFilter ran:\n\t" << strippedFilter << "\n\tRPossibleWarning='" << RPossibleWarning << "'\n\t\tfor revision " << _dataSet->filter()->revision() << std::endl;
+
 		_dataSet->db().transactionWriteBegin();
 		_dataSet->filter()->setRFilter(filter);
 		_dataSet->filter()->setFilterVector(filterResult);
@@ -313,7 +315,14 @@ void Engine::runFilter(const std::string & filter, const std::string & generated
 	}
 	catch(filterException & e)
 	{
-		sendFilterError(filterRequestId, std::string(e.what()).length() > 0 ? e.what() : "Something went wrong with the filter but it is unclear what.");
+		std::string error = std::string(e.what()).length() > 0 ? e.what() : "Something went wrong with the filter but it is unclear what.";
+
+		_dataSet->db().transactionWriteBegin();
+		_dataSet->filter()->setErrorMsg(error);
+		_dataSet->filter()->incRevision();
+		_dataSet->db().transactionWriteEnd();
+
+		sendFilterError(filterRequestId, error);
 	}
 
 	_engineState = engineState::idle;
@@ -336,10 +345,11 @@ void Engine::sendFilterError(int filterRequestId, const std::string & errorMessa
 {
 	Json::Value filterResponse = Json::Value(Json::objectValue);
 
-        provideAndUpdateDataSet()->filter()->setErrorMsg(errorMessage);
+	Log::log() << "Engine::sendFilterError(filterRequestId=" << filterRequestId << ", errorMsg='" << errorMessage << "')" << std::endl;
 
 	filterResponse["typeRequest"]	= engineStateToString(engineState::filter);
 	filterResponse["requestId"]		= filterRequestId;
+	filterResponse["error"]			= errorMessage;
 
 	sendString(filterResponse.toStyledString());
 }
@@ -862,11 +872,11 @@ void Engine::removeNonKeepFiles(const Json::Value & filesToKeepValue)
 
 DataSet * Engine::provideAndUpdateDataSet()
 {
-	JASPTIMER_RESUME(Engine::provideDataSet());
+	JASPTIMER_RESUME(Engine::provideAndUpdateDataSet());
 
 	if(_dataSet)
 	{
-		Log::log() << "There is a dataset, ";
+		Log::log() << "Engine::provideAndUpdateDataSet(): There is a dataset, ";
 		if(_dataSet->checkForUpdates())
 		{
 			Log::log(false) << "updates found, loading them.";

R-Interface/jasprcpp.cpp

@@ -345,7 +345,7 @@ int STDCALL jaspRCPP_runFilter(const char * filterCode, bool ** arrayPointer)
 {
 	jaspRCPP_logString("jaspRCPP_runFilter runs: \n\"" + std::string(filterCode) + "\"\n" );
 
-	lastErrorMessage = "";
+	jaspRCPP_resetErrorMsg();
 	rinside->instance()[".filterCode"] = filterCode;
 
 	const std::string filterTryCatch(