From 9ba833e70f75729e41a4eda5fdf03871b283d8e8 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 9 Jan 2025 12:31:02 +0100 Subject: [PATCH 1/4] Set ALT as no-brush-size-changes modifier --- src/ScatterplotWidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ScatterplotWidget.cpp b/src/ScatterplotWidget.cpp index 1eda862..a8c0b12 100644 --- a/src/ScatterplotWidget.cpp +++ b/src/ScatterplotWidget.cpp @@ -80,10 +80,12 @@ ScatterplotWidget::ScatterplotWidget() : _pixelSelectionTool.setEnabled(true); _pixelSelectionTool.setMainColor(QColor(Qt::black)); + _pixelSelectionTool.setFixedBrushRadiusModifier(Qt::AltModifier); _samplerPixelSelectionTool.setEnabled(true); _samplerPixelSelectionTool.setMainColor(QColor(Qt::black)); - + _samplerPixelSelectionTool.setFixedBrushRadiusModifier(Qt::AltModifier); + connect(&_pixelSelectionTool, &PixelSelectionTool::shapeChanged, [this]() { if (isInitialized()) update(); From f1fbb1547e5669de5c5465384964060172d412e0 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 9 Jan 2025 12:31:12 +0100 Subject: [PATCH 2/4] Fix typo --- src/ScatterplotWidget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScatterplotWidget.h b/src/ScatterplotWidget.h index 3bbc3be..0c331fc 100644 --- a/src/ScatterplotWidget.h +++ b/src/ScatterplotWidget.h @@ -111,7 +111,7 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C void showHighlights(bool show); /** - * Set sigma value for kernel density esitimation. + * Set sigma value for kernel density estimation. * @param sigma kernel width as a fraction of the output square width. Typical values are [0.01 .. 0.5] */ void setSigma(const float sigma); From 4f45c9f9d84d4854d1243820017e7590a60694e7 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 9 Jan 2025 12:31:38 +0100 Subject: [PATCH 3/4] Meta data consistent with other plugins --- src/ScatterplotPlugin.cpp | 2 +- src/ScatterplotPlugin.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp index 00c2df7..bc547f6 100644 --- a/src/ScatterplotPlugin.cpp +++ b/src/ScatterplotPlugin.cpp @@ -33,7 +33,7 @@ #include #include -Q_PLUGIN_METADATA(IID "nl.tudelft.ScatterplotPlugin") +Q_PLUGIN_METADATA(IID "studio.manivault.ScatterplotPlugin") using namespace mv; using namespace mv::util; diff --git a/src/ScatterplotPlugin.h b/src/ScatterplotPlugin.h index d001ade..e355d05 100644 --- a/src/ScatterplotPlugin.h +++ b/src/ScatterplotPlugin.h @@ -135,9 +135,9 @@ class ScatterplotPlugin : public ViewPlugin class ScatterplotPluginFactory : public ViewPluginFactory { Q_INTERFACES(mv::plugin::ViewPluginFactory mv::plugin::PluginFactory) - Q_OBJECT - Q_PLUGIN_METADATA(IID "nl.tudelft.ScatterplotPlugin" - FILE "ScatterplotPlugin.json") + Q_OBJECT + Q_PLUGIN_METADATA(IID "studio.manivault.ScatterplotPlugin" + FILE "ScatterplotPlugin.json") public: ScatterplotPluginFactory(void) {} From b5b016f40a25caf8ab72551d2d10f5297b7c1650 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 9 Jan 2025 12:32:11 +0100 Subject: [PATCH 4/4] Format, includes and remove unused code --- src/ScatterplotPlugin.cpp | 7 +++---- src/ScatterplotPlugin.h | 5 +---- src/ScatterplotWidget.cpp | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp index bc547f6..3b319b4 100644 --- a/src/ScatterplotPlugin.cpp +++ b/src/ScatterplotPlugin.cpp @@ -81,8 +81,6 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) : _primaryToolbarAction.addAction(&_settingsAction.getSelectionAction()); _primaryToolbarAction.addAction(&getSamplerAction()); - _secondaryToolbarAction.addAction(&_settingsAction.getColoringAction().getColorMap1DAction(), 1); - auto focusSelectionAction = new ToggleAction(this, "Focus selection"); focusSelectionAction->setIcon(Application::getIconFont("FontAwesome").getIcon("mouse-pointer")); @@ -104,6 +102,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) : connect(_scatterPlotWidget, &ScatterplotWidget::renderModeChanged, this, updateReadOnly); connect(&_positionDataset, &Dataset::changed, this, updateReadOnly); + _secondaryToolbarAction.addAction(&_settingsAction.getColoringAction().getColorMap1DAction(), 1); _secondaryToolbarAction.addAction(focusSelectionAction, 2); //_secondaryToolbarAction.addAction(&_settingsAction.getExportAction()); _secondaryToolbarAction.addAction(&_settingsAction.getMiscellaneousAction()); @@ -134,7 +133,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) : if (datasetsMimeData->getDatasets().count() > 1) return dropRegions; - const auto dataset = datasetsMimeData->getDatasets().first(); + const auto& dataset = datasetsMimeData->getDatasets().first(); const auto datasetGuiName = dataset->text(); const auto datasetId = dataset->getId(); const auto dataType = dataset->getDataType(); @@ -831,7 +830,7 @@ PluginTriggerActions ScatterplotPluginFactory::getPluginTriggerActions(const mv: if (numberOfDatasets >= 1) { auto pluginTriggerAction = new PluginTriggerAction(const_cast(this), this, "Scatterplot", "View selected datasets side-by-side in separate scatter plot viewers", fontAwesome.getIcon("braille"), [this, getInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void { - for (auto dataset : datasets) + for (const auto& dataset : datasets) getInstance()->loadData(Datasets({ dataset })); }); diff --git a/src/ScatterplotPlugin.h b/src/ScatterplotPlugin.h index e355d05..7ca72e7 100644 --- a/src/ScatterplotPlugin.h +++ b/src/ScatterplotPlugin.h @@ -3,6 +3,7 @@ #include #include +#include #include "SettingsAction.h" @@ -13,14 +14,10 @@ using namespace mv::util; using namespace mv::gui; class Points; - class ScatterplotWidget; namespace mv { - class CoreInterface; - class Vector2f; - namespace gui { class DropWidget; } diff --git a/src/ScatterplotWidget.cpp b/src/ScatterplotWidget.cpp index a8c0b12..8dd0af6 100644 --- a/src/ScatterplotWidget.cpp +++ b/src/ScatterplotWidget.cpp @@ -73,8 +73,7 @@ ScatterplotWidget::ScatterplotWidget() : setFocusPolicy(Qt::ClickFocus); grabGesture(Qt::PinchGesture); //setAttribute(Qt::WA_TranslucentBackground); - - this->installEventFilter(this); + installEventFilter(this); _navigationAction.initialize(this);