diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44abd82..67472a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,10 @@ jobs: conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}} conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}} rs_ssh_key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }} + sentry-url: ${{secrets.LKEB_SENTRY_URL }} + sentry-org: ${{secrets.LKEB_SENTRY_ORG }} + sentry-project: ${{secrets.LKEB_SENTRY_PROJECT }} + sentry-auth-token: ${{secrets.LKEB_SENTRY_AUTH_TOKEN }} - name: Linux build if: startsWith(matrix.os, 'ubuntu') @@ -100,4 +104,4 @@ jobs: build-arch: ${{matrix.build-arch}} conan-user: ${{secrets.LKEB_UPLOAD_USER}} conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}} - conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}} \ No newline at end of file + conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}} diff --git a/conanfile.py b/conanfile.py index ba6073f..3b84dde 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,8 +1,10 @@ from conans import ConanFile from conan.tools.cmake import CMakeDeps, CMake, CMakeToolchain from conans.tools import save, load +from conans import tools import os import pathlib +import shutil import subprocess from rules_support import PluginBranchInfo @@ -98,6 +100,7 @@ def generate(self): # Use the ManiVault .cmake file to find ManiVault with find_package mv_core_root = self.deps_cpp_info["hdps-core"].rootpath manivault_dir = pathlib.Path(mv_core_root, "cmake", "mv").as_posix() + print("ManiVault_DIR: ", manivault_dir) tc.variables["ManiVault_DIR"] = manivault_dir diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp index a2dd6aa..8a6610d 100644 --- a/src/ScatterplotPlugin.cpp +++ b/src/ScatterplotPlugin.cpp @@ -413,8 +413,11 @@ void ScatterplotPlugin::selectPoints() auto& pixelSelectionTool = _scatterPlotWidget->getPixelSelectionTool(); + auto renderer = _settingsAction.getRenderModeAction().getCurrentIndex() > 0 ? dynamic_cast(&_scatterPlotWidget->_densityRenderer) : dynamic_cast(&_scatterPlotWidget->_pointRenderer); + auto& navigator = renderer->getNavigator(); + // Only proceed with a valid points position dataset and when the pixel selection tool is active - if (!_positionDataset.isValid() || !pixelSelectionTool.isActive() || _scatterPlotWidget->_pointRenderer.getNavigator().isNavigating() || !pixelSelectionTool.isEnabled()) + if (!_positionDataset.isValid() || !pixelSelectionTool.isActive() || navigator.isNavigating() || !pixelSelectionTool.isEnabled()) return; auto selectionAreaImage = pixelSelectionTool.getAreaPixmap().toImage(); @@ -428,11 +431,8 @@ void ScatterplotPlugin::selectPoints() _positionDataset->getGlobalIndices(localGlobalIndices); - auto& pointRenderer = _scatterPlotWidget->_pointRenderer; - auto& navigator = pointRenderer.getNavigator(); - const auto zoomRectangleWorld = navigator.getZoomRectangleWorld(); - const auto screenRectangle = QRect(QPoint(), pointRenderer.getRenderSize()); + const auto screenRectangle = QRect(QPoint(), renderer->getRenderSize()); float boundaries[4]{ std::numeric_limits::max(), @@ -517,7 +517,7 @@ void ScatterplotPlugin::selectPoints() } } - auto& navigationAction = _scatterPlotWidget->getPointRendererNavigator().getNavigationAction(); + auto& navigationAction = navigator.getNavigationAction(); navigationAction.getZoomSelectionAction().setEnabled(!targetSelectionIndices.empty() && !navigationAction.getFreezeNavigation().isChecked()); diff --git a/src/ScatterplotWidget.cpp b/src/ScatterplotWidget.cpp index 8fc0413..535c985 100644 --- a/src/ScatterplotWidget.cpp +++ b/src/ScatterplotWidget.cpp @@ -153,7 +153,7 @@ bool ScatterplotWidget::event(QEvent* event) } auto setIsNavigating = [this](bool isNavigating) -> void { - _pixelSelectionTool.setEnabled(getRenderMode() == RenderMode::SCATTERPLOT && !isNavigating); + _pixelSelectionTool.setEnabled((getRenderMode() == RenderMode::SCATTERPLOT || getRenderMode() == RenderMode::DENSITY) && !isNavigating); if (isNavigating) { _samplerPixelSelectionTool.setEnabled(false);