Fix zoom changes brush size (#156)

* Set ALT as no-brush-size-changes modifier

* Fix typo

* Meta data consistent with other plugins

* Format, includes and remove unused code

Author: alxvth

src/ScatterplotPlugin.cpp

@@ -33,7 +33,7 @@
 #include <vector>
 #include <actions/ViewPluginSamplerAction.h>
 
-Q_PLUGIN_METADATA(IID "nl.tudelft.ScatterplotPlugin")
+Q_PLUGIN_METADATA(IID "studio.manivault.ScatterplotPlugin")
 
 using namespace mv;
 using namespace mv::util;
@@ -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<Points>::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<ScatterplotPluginFactory*>(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 }));
             });
 

src/ScatterplotPlugin.h

@@ -3,6 +3,7 @@
 #include <ViewPlugin.h>
 
 #include <actions/HorizontalToolbarAction.h>
+#include <graphics/Vector2f.h>
 
 #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;
     }
@@ -135,9 +132,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) {}

src/ScatterplotWidget.cpp

@@ -73,17 +73,18 @@ ScatterplotWidget::ScatterplotWidget() :
     setFocusPolicy(Qt::ClickFocus);
     grabGesture(Qt::PinchGesture);
     //setAttribute(Qt::WA_TranslucentBackground);
-
-    this->installEventFilter(this);
+    installEventFilter(this);
 
     _navigationAction.initialize(this);
 
     _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();

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);