Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fcd6c78
DataSetQ Etc
JorisGoosen Aug 6, 2025
f3ce2a5
add rudimentary column filtering
JorisGoosen Sep 4, 2025
4e95f96
less columnindex more columnname
JorisGoosen Sep 4, 2025
78628ee
use columnname in more spots
JorisGoosen Sep 4, 2025
0ce9dc0
compileert niet
JorisGoosen Sep 4, 2025
efdb082
compileert weer
JorisGoosen Sep 30, 2025
ee0af8f
filter is ok again
JorisGoosen Sep 30, 2025
e31e951
fix unittest
JorisGoosen Sep 30, 2025
50b93f0
add statusbar
JorisGoosen Sep 30, 2025
0a03172
support adding filters
JorisGoosen Sep 30, 2025
2b075e3
its really just the default filter, probably should select what to "s…
JorisGoosen Sep 30, 2025
2449144
gotta clean up labels on destruction
JorisGoosen Oct 1, 2025
8811e5b
dont store the doubles separately anymore, and do some tweaks to make…
JorisGoosen Oct 1, 2025
b381021
fix loading the data
JorisGoosen Oct 1, 2025
a7e44c2
ensure children items of datasetview are always in the same thread at…
JorisGoosen Oct 1, 2025
0e31a1a
try to make filter selection work also add stuff for filter per analysis
JorisGoosen Oct 1, 2025
74f2a2c
add filter button
JorisGoosen Oct 2, 2025
e70a139
make selecting a filter work
JorisGoosen Oct 2, 2025
8a54ab2
store and load filter in analysis
JorisGoosen Oct 2, 2025
5fd9d1b
doesnt compile
JorisGoosen Oct 2, 2025
0502c71
try to load filter when analysis runs
JorisGoosen Oct 2, 2025
1bcd7bf
Analysis now uses selected filter and gets refreshed when updated
JorisGoosen Oct 8, 2025
49ff8a6
computed columns work again with filter, and lets just not allow "no …
JorisGoosen Oct 8, 2025
6550b3e
make computed columns behave with filters
JorisGoosen Oct 8, 2025
6ec94b6
also allow reset.
JorisGoosen Oct 8, 2025
ceea99a
postmerge fix
JorisGoosen Oct 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common/enginedefinitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion Common/tempfiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
17 changes: 12 additions & 5 deletions CommonData/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
Loading
Loading