Fix sampling points

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -456,7 +456,7 @@ void ScatterplotPlugin::samplePoints()
 {
     auto& samplerPixelSelectionTool = _scatterPlotWidget->getSamplerPixelSelectionTool();
 
-    if (!_positionDataset.isValid() || !samplerPixelSelectionTool.isActive() || _scatterPlotWidget->_pointRenderer.getNavigator().isNavigating() || !samplerPixelSelectionTool.isEnabled())
+    if (!_positionDataset.isValid() || _scatterPlotWidget->_pointRenderer.getNavigator().isNavigating() || !samplerPixelSelectionTool.isActive())
         return;
 
     auto selectionAreaImage = samplerPixelSelectionTool.getAreaPixmap().toImage();

src/ScatterplotWidget.cpp

@@ -4,21 +4,17 @@
 
 #include <util/Exception.h>
 
-#include <vector>
+#include <ViewPlugin.h>
 
 #include <QDebug>
-#include <QGuiApplication>
-#include <QMatrix4x4>
 #include <QOpenGLFramebufferObject>
 #include <QPainter>
 #include <QSize>
 #include <QWheelEvent>
 #include <QWindow>
 #include <QRectF>
 
-#include <math.h>
-
-#include <ViewPlugin.h>
+#include <vector>
 
 using namespace mv;
 
@@ -76,10 +72,6 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
     _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();
@@ -169,6 +161,10 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 
     _pointRenderer.getNavigator().initialize(this);
     _densityRenderer.getNavigator().initialize(this);
+
+    _samplerPixelSelectionTool.setEnabled(true);
+    _samplerPixelSelectionTool.setMainColor(QColor(Qt::black));
+    _samplerPixelSelectionTool.setFixedBrushRadiusModifier(Qt::AltModifier);
 }
 
 bool ScatterplotWidget::event(QEvent* event)
@@ -432,7 +428,7 @@ mv::Vector3f ScatterplotWidget::getColorMapRange() const
             break;
     }
 
-    return Vector3f();
+    return {};
 }
 
 void ScatterplotWidget::setColorMapRange(const float& min, const float& max)