DataSetQ Etc

make classes

make it shorter

start moving functionality to their proper place

flesh out DataSetQ

maak factory functies en ruim datasetpackage alvast beetje op

Move label set stuff to ColumnQ from DataSetPackage and some related changes

Fairly sure the whol beginLoadingData etc in DataSetPackage isnt really necessary anymore

move more stuff to Filter

add invalidation to Filter

move LabelFilterGenerator to another spot

also tightly integrate it with FilterQ etc

fix some problems

move more stuff from FilterModel to FilterQ

cleanin

more changes

use set functions for deserializen etc

stapjes

fix errors

merge Q classes into the base data classes

move labelfiltergenerator to CommonData

move some more files around

meer fixes

add dropped function back

fix more things

remove lots of _undoStack and more changes

JASP compiles again

jasp starts

try and get the data to show

data shows now

compiles and mostly runs but complains about threads

make sure data classes are moved to the main thread so qml etc can access it later without crying

throw in an error

ill just add the dataPkgRoles to the rolenames regardles of what each proxy thinks about it

variables show up in lists, analyses work
filters dont get run, but at least the proxy doesnt choke on it anymore

make label editor seem to work again

remove useless passtrhough on filtermodel

filter shows

use invalidation

rfilter works

labelfiltergenerator is generating once more

make sure filter gets updated if constructorR gets changed

clarify which labels are from column label order, or dataset order

make column selection not crash

debug purple!

make editable

just change visibity instead of the color

Author: JorisGoosen

Common/enginedefinitions.h

@@ -13,7 +13,7 @@ DECLARE_ENUM(performType,			run, abort, saveImg, editImg, rewriteImgs);
 DECLARE_ENUM(analysisResultStatus,	validationError, fatalError, imageSaved, imageEdited, imagesRewritten, complete, running, changed, waiting);
 DECLARE_ENUM(moduleStatus,			initializing, installNeeded, loading, readyForUse, error);
 DECLARE_ENUM(engineAnalysisStatus,	empty, toRun, running, changed, complete, error, exception, aborted, stopped, saveImg, editImg, rewriteImgs, synchingData);
-DECLARE_ENUM(enginesListRoles,		channel =  257, module, engineState, analysisStatus, runsWhat, running, idle, idleSoon); //hardcoded Qt::UserRole + 1, sue me.
+DECLARE_ENUM(enginesListRoles,		channel =  257, module, engineState, analysisStatus, runsWhat, running, idle, idleSoon); //hardcoded Qt::UserRole + 1
 
 struct unexpectedEngineReply  : public std::runtime_error
 {

Common/tempfiles.cpp

@@ -362,7 +362,7 @@ void TempFiles::deleteStrayRootFiles(const stringvec& validIDs, long outOfDateDe
 	{
 		std::filesystem::path p = itr->path();
 
-		Log::log() << "looking at file " << p.string() << std::endl;
+		//Log::log() << "looking at file " << p.string() << std::endl;
 
 		string fileName		= Utils::osPath(p.filename());
 		bool is_directory	= std::filesystem::is_directory(p, error);

CommonData/CMakeLists.txt

@@ -41,14 +41,18 @@ target_include_directories(
 	${R_INCLUDE_PATH}
 	${R_HOME_PATH}/include
 	${RCPP_PATH}/include
-  ${Boost_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
 	PRIVATE
 	SQLite::SQLite3
 	)
 
 target_link_libraries(
     CommonData
     PUBLIC
+	Qt::Core
+	Qt::Gui
+    Qt::Qml
+    Qt::Quick
     LibArchive::LibArchive
 #    Common
     SQLite::SQLite3
@@ -59,10 +63,13 @@ target_link_libraries(
 
 target_compile_definitions(
   CommonData
-  PUBLIC $<$<BOOL:${JASP_PRINT_ENGINE_MESSAGES}>:PRINT_ENGINE_MESSAGES>
-		 BUILDING_JASP_ENGINE R_HOME=${R_HOME_PATH}
-		$<$<BOOL:${JASP_TIMER_USED}>:PROFILE_JASP>
-		JSONCPP_NO_LOCALE_SUPPORT	)
+  PUBLIC 
+  $<$<BOOL:${JASP_PRINT_ENGINE_MESSAGES}>:PRINT_ENGINE_MESSAGES>
+  BUILDING_JASP_ENGINE R_HOME=${R_HOME_PATH}
+  $<$<BOOL:${JASP_TIMER_USED}>:PROFILE_JASP>
+  JSONCPP_NO_LOCALE_SUPPORT	
+  JASP_USES_QT_HERE
+)
 
 if(APPLE OR WINDOWS)
   target_compile_definitions(CommonData PUBLIC BOOST_INTERPROCESS_SHARED_DIR_FUNC)