Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
6d9ee62
DataSetQ Etc
JorisGoosen Aug 6, 2025
64fcd5e
add rudimentary column filtering
JorisGoosen Sep 4, 2025
08906fd
less columnindex more columnname
JorisGoosen Sep 4, 2025
c6d94ee
use columnname in more spots
JorisGoosen Sep 4, 2025
42fb6fe
compileert niet
JorisGoosen Sep 4, 2025
b317411
compileert weer
JorisGoosen Sep 30, 2025
2bc544c
filter is ok again
JorisGoosen Sep 30, 2025
e9d40e1
fix unittest
JorisGoosen Sep 30, 2025
f52eaa4
add statusbar
JorisGoosen Sep 30, 2025
7eba37e
support adding filters
JorisGoosen Sep 30, 2025
9bd881b
its really just the default filter, probably should select what to "s…
JorisGoosen Sep 30, 2025
7a76a03
gotta clean up labels on destruction
JorisGoosen Oct 1, 2025
6646ce5
dont store the doubles separately anymore, and do some tweaks to make…
JorisGoosen Oct 1, 2025
e16bf29
fix loading the data
JorisGoosen Oct 1, 2025
1da1101
ensure children items of datasetview are always in the same thread at…
JorisGoosen Oct 1, 2025
c3c3aee
try to make filter selection work also add stuff for filter per analysis
JorisGoosen Oct 1, 2025
c15a13f
add filter button
JorisGoosen Oct 2, 2025
523d215
make selecting a filter work
JorisGoosen Oct 2, 2025
8652508
store and load filter in analysis
JorisGoosen Oct 2, 2025
bb9caaf
doesnt compile
JorisGoosen Oct 2, 2025
f601f89
try to load filter when analysis runs
JorisGoosen Oct 2, 2025
b69be46
Analysis now uses selected filter and gets refreshed when updated
JorisGoosen Oct 8, 2025
e37671a
computed columns work again with filter, and lets just not allow "no …
JorisGoosen Oct 8, 2025
b45a44f
make computed columns behave with filters
JorisGoosen Oct 8, 2025
a566e41
also allow reset.
JorisGoosen Oct 8, 2025
0a3f2b2
postmerge fix
JorisGoosen Oct 9, 2025
66ac7b8
some columns now become ordinal, but that actually looks good to me, …
JorisGoosen Nov 5, 2025
6c413c9
make dataview headers look nice
JorisGoosen Nov 5, 2025
1b911a4
just give all filters their own generator thingy and itll work fine
JorisGoosen Nov 5, 2025
3b94da5
add properties to column
JorisGoosen Nov 5, 2025
bad8b2c
add hasLabels property
JorisGoosen Nov 5, 2025
d9afe5f
prepare GUI for disabling labels
JorisGoosen Nov 5, 2025
13527cf
show that you are disabled
JorisGoosen Nov 5, 2025
7a215fb
start supporting hasLabels property
JorisGoosen Nov 5, 2025
ebae85f
Changes to store data without labels
JorisGoosen Nov 5, 2025
32ff8aa
try to get the new dataformat to load
JorisGoosen Nov 5, 2025
49459bb
data can load in the engine now
JorisGoosen Nov 5, 2025
bd7cd93
switching to ordinal still crashes the engine
JorisGoosen Nov 5, 2025
525f663
ok klaar voor gisteren
JorisGoosen Nov 5, 2025
ed5bc8c
ordinals and nominals without labels now also load fine
JorisGoosen Nov 6, 2025
2c97294
try to init columns to the right setting of hasLabels (try to not mak…
JorisGoosen Nov 6, 2025
55672fe
data loads ok
JorisGoosen Nov 7, 2025
c024bcb
postmerge fix
JorisGoosen Nov 19, 2025
c04f1f0
avoid a crash on close and make sure labelless columns update their m…
JorisGoosen Nov 19, 2025
b145546
make pre 0.18 jaspfiles load again
JorisGoosen Nov 19, 2025
4a22324
dont throw away just loaded data
JorisGoosen Nov 25, 2025
21ed1c6
now it loads 0.18.3 debug jaspfile
JorisGoosen Nov 25, 2025
a2d8a79
0.18.3 file loads all the way now
JorisGoosen Nov 25, 2025
fe773c6
dont load 'nan' as a string
JorisGoosen Nov 25, 2025
8987af4
setValue hasLabels specificity needed
JorisGoosen Nov 26, 2025
dfc140f
make sure computed columns also work without labels
JorisGoosen Nov 26, 2025
52b69f8
start multiplying them datasets
JorisGoosen Nov 27, 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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ endif()

project(
JASP
VERSION 0.95.4.0 # <major>[.<minor>[.<patch>[.<tweak>]]]
VERSION 0.96.0.0 # <major>[.<minor>[.<patch>[.<tweak>]]]
LANGUAGES CXX C
HOMEPAGE_URL "http://jasp-stats.org/"
DESCRIPTION "A fresh way to do statistics")
Expand Down
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 @@ -44,14 +44,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 @@ -62,10 +66,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