From 68dd38a8ae2b6c36252e7f10998db5560ddc19ba Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 20 May 2026 11:10:31 +0200 Subject: [PATCH 1/3] Use new getter for clarity (avoid negation) (#242) --- src/ScatterplotPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp index 42d2939..a675682 100644 --- a/src/ScatterplotPlugin.cpp +++ b/src/ScatterplotPlugin.cpp @@ -569,7 +569,7 @@ void ScatterplotPlugin::selectPoints() auto& navigationAction = navigator.getNavigationAction(); - navigationAction.getZoomSelectionAction().setEnabled(!targetSelectionIndices.empty() && !navigationAction.getFreezeNavigation().isChecked()); + navigationAction.getZoomSelectionAction().setEnabled(!targetSelectionIndices.empty() && navigationAction.isNavigationActive()); _positionDataset->setSelectionIndices(targetSelectionIndices); From b5063df9a8ca9ca6663ea3deed268be53e36a7b2 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 16 Jun 2026 10:37:04 +0200 Subject: [PATCH 2/3] Use `mv_project_defaults()` for setting CMake defaults (#241) * Use mv project defaults * Simplify unity build setup * Prefer target based properties * Set cache variable instead of normal variable for CMake option --- CMakeLists.txt | 18 +++++------------- conanfile.py | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59655d7..39453a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,17 +15,7 @@ PROJECT(${PROJECT} # ----------------------------------------------------------------------------- # CMake Options # ----------------------------------------------------------------------------- -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOMOC ON) - -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /W3 /MP /permissive- /Zc:__cplusplus") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") -endif() # ----------------------------------------------------------------------------- # Dependencies @@ -33,6 +23,7 @@ endif() find_package(Qt6 COMPONENTS Widgets WebEngineWidgets OpenGL OpenGLWidgets REQUIRED) find_package(ManiVault COMPONENTS Core PointData ClusterData ColorData ImageData CONFIG QUIET) +mv_project_defaults() # ----------------------------------------------------------------------------- # Source files @@ -116,9 +107,10 @@ target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}") # ----------------------------------------------------------------------------- target_compile_features(${PROJECT} PRIVATE cxx_std_20) -if(MV_UNITY_BUILD) - set_target_properties(${PROJECT} PROPERTIES UNITY_BUILD ON) -endif() +set_target_properties(${PROJECT} PROPERTIES + AUTOMOC ON + UNITY_BUILD ${MV_UNITY_BUILD} +) # ----------------------------------------------------------------------------- # Target library linking diff --git a/conanfile.py b/conanfile.py index 3b84dde..73491bf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -105,7 +105,7 @@ def generate(self): tc.variables["ManiVault_DIR"] = manivault_dir # Set some build options - tc.variables["MV_UNITY_BUILD"] = "ON" + tc.cache_variables["MV_UNITY_BUILD"] = True tc.generate() From 874528022fe85dc1d12a12fe621152bd32ea2510 Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Tue, 23 Jun 2026 09:45:50 +0200 Subject: [PATCH 3/3] Adhere to revamped core --- src/ScalarAction.cpp | 4 ++-- src/ScatterplotPlugin.cpp | 1 + src/SettingsAction.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ScalarAction.cpp b/src/ScalarAction.cpp index f500bac..57653e4 100644 --- a/src/ScalarAction.cpp +++ b/src/ScalarAction.cpp @@ -184,7 +184,7 @@ void ScalarAction::fromVariantMap(const QVariantMap& variantMap) _magnitudeAction.fromParentVariantMap(variantMap); _sourceAction.fromParentVariantMap(variantMap); - _sourceDatasetPickerAction.fromParentVariantMap(variantMap); + //_sourceDatasetPickerAction.fromParentVariantMap(variantMap); } QVariantMap ScalarAction::toVariantMap() const @@ -193,7 +193,7 @@ QVariantMap ScalarAction::toVariantMap() const _magnitudeAction.insertIntoVariantMap(variantMap); _sourceAction.insertIntoVariantMap(variantMap); - _sourceDatasetPickerAction.insertIntoVariantMap(variantMap); + //_sourceDatasetPickerAction.insertIntoVariantMap(variantMap); return variantMap; } diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp index a675682..531eb45 100644 --- a/src/ScatterplotPlugin.cpp +++ b/src/ScatterplotPlugin.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/src/SettingsAction.cpp b/src/SettingsAction.cpp index 03d0f82..f0739dc 100644 --- a/src/SettingsAction.cpp +++ b/src/SettingsAction.cpp @@ -70,8 +70,8 @@ void SettingsAction::fromVariantMap(const QVariantMap& variantMap) _plotAction.fromParentVariantMap(variantMap); _positionAction.fromParentVariantMap(variantMap); _coloringAction.fromParentVariantMap(variantMap); - _subsetAction.fromParentVariantMap(variantMap); - _clusteringAction.fromParentVariantMap(variantMap); + _subsetAction.fromParentVariantMap(variantMap, true); + _clusteringAction.fromParentVariantMap(variantMap, true); _renderModeAction.fromParentVariantMap(variantMap); _selectionAction.fromParentVariantMap(variantMap); _miscellaneousAction.fromParentVariantMap(variantMap);