Work on integration new two-dimensional renderer

ThomasKroes · ThomasKroes · commit 1d9dab9d8e4b · 2025-03-21T09:38:01.000+01:00
diff --git a/src/NavigationAction.cpp b/src/NavigationAction.cpp
@@ -49,8 +49,6 @@ void NavigationAction::initialize(ScatterplotWidget* scatterplotWidget)
     _scatterplotWidget = scatterplotWidget;
 
     _scatterplotWidget->addAction(&_zoomDataExtentsAction);
-
-    connect(&_zoomDataExtentsAction, &TriggerAction::triggered, _scatterplotWidget, &ScatterplotWidget::resetView);
 }
 
 void NavigationAction::connectToPublicAction(WidgetAction* publicAction, bool recursive)
diff --git a/src/ScatterplotPlugin.cpp b/src/ScatterplotPlugin.cpp
@@ -360,7 +360,7 @@ void ScatterplotPlugin::selectPoints()
     auto& pixelSelectionTool = _scatterPlotWidget->getPixelSelectionTool();
 
     // Only proceed with a valid points position dataset and when the pixel selection tool is active
-    if (!_positionDataset.isValid() || !pixelSelectionTool.isActive() || _scatterPlotWidget->isNavigating() || !pixelSelectionTool.isEnabled())
+    if (!_positionDataset.isValid() || !pixelSelectionTool.isActive() || _scatterPlotWidget->_pointRenderer.getNavigator().isNavigating() || !pixelSelectionTool.isEnabled())
         return;
 
     auto selectionAreaImage = pixelSelectionTool.getAreaPixmap().toImage();
@@ -450,7 +450,7 @@ void ScatterplotPlugin::samplePoints()
 {
     auto& samplerPixelSelectionTool = _scatterPlotWidget->getSamplerPixelSelectionTool();
 
-    if (!_positionDataset.isValid() || !samplerPixelSelectionTool.isActive() || _scatterPlotWidget->isNavigating() || !samplerPixelSelectionTool.isEnabled())
+    if (!_positionDataset.isValid() || !samplerPixelSelectionTool.isActive() || _scatterPlotWidget->_pointRenderer.getNavigator().isNavigating() || !samplerPixelSelectionTool.isEnabled())
         return;
 
     auto selectionAreaImage = samplerPixelSelectionTool.getAreaPixmap().toImage();
diff --git a/src/ScatterplotWidget.cpp b/src/ScatterplotWidget.cpp
@@ -49,8 +49,6 @@ namespace
 }
 
 ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
-    QOpenGLWidget(),
-    _pointRenderer(),
     _densityRenderer(DensityRenderer::RenderMode::DENSITY),
     _isInitialized(false),
     _renderMode(SCATTERPLOT),
@@ -59,21 +57,17 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
     _widgetSizeInfo(),
     _dataRectangleAction(this, "Data rectangle"),
     _navigationAction(this, "Navigation"),
-    _colorMapImage(),
     _pixelSelectionTool(this),
     _samplerPixelSelectionTool(this),
     _pixelRatio(1.0),
-    _mousePositions(),
-    _isNavigating(false),
     _weightDensity(false),
     _parentPlugin(parentPlugin)
 {
     setContextMenuPolicy(Qt::CustomContextMenu);
     setAcceptDrops(true);
     setMouseTracking(true);
-    setFocusPolicy(Qt::ClickFocus);
+    //setFocusPolicy(Qt::ClickFocus);
     grabGesture(Qt::PinchGesture);
-    //setAttribute(Qt::WA_TranslucentBackground);
     installEventFilter(this);
 
     _navigationAction.initialize(this);
@@ -146,159 +140,58 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 
         update();
     });
-}
 
-bool ScatterplotWidget::event(QEvent* event)
-{
-    if (!event)
-        return QOpenGLWidget::event(event);
+    connect(&_navigationAction.getZoomDataExtentsAction(), &TriggerAction::triggered, this, [this]() -> void {
+        _pointRenderer.getNavigator().resetView();
+    });
 
-    auto setIsNavigating = [this](bool isNavigating) -> void {
-        _isNavigating = isNavigating;
+    connect(&_pointRenderer.getNavigator(), &Navigator2D::isNavigatingChanged, this, [this](bool isNavigating) -> void {
         _pixelSelectionTool.setEnabled(!isNavigating);
-        if (isNavigating) {
+
+    	if (isNavigating) {
             _samplerPixelSelectionTool.setEnabled(false);
         }
-        else if (_parentPlugin) { // reset to UI-setting
+        else if (_parentPlugin) {
             _samplerPixelSelectionTool.setEnabled(_parentPlugin->getSamplerAction().getEnabledAction().isChecked());
         }
+	});
 
-        };
-
-    // Set navigation flag on Alt press/release
-    if (event->type() == QEvent::KeyRelease) {
-        if (const auto* keyEvent = static_cast<QKeyEvent*>(event)) {
-            if (keyEvent->key() == Qt::Key_Alt) {
-                setIsNavigating(false);
-            }
-        }
-
-    }
-    else if (event->type() == QEvent::KeyPress) {
-        if (const auto* keyEvent = static_cast<QKeyEvent*>(event)) {
-            if (keyEvent->key() == Qt::Key_Alt) {
-                setIsNavigating(true);
-            }
-        }
+    connect(&_pointRenderer, &Renderer2D::zoomRectangleChanged, this, [this]() -> void { update(); });
 
-    }
+    //auto setIsNavigating = [this](bool isNavigating) -> void {
+    //    _isNavigating = isNavigating;
+    //    _pixelSelectionTool.setEnabled(!isNavigating);
+    //    if (isNavigating) {
+    //        _samplerPixelSelectionTool.setEnabled(false);
+    //    }
+    //    else if (_parentPlugin) { // reset to UI-setting
+    //        _samplerPixelSelectionTool.setEnabled(_parentPlugin->getSamplerAction().getEnabledAction().isChecked());
+    //    }
 
-    // Interactions when Alt is pressed
-    if (isInitialized() && QGuiApplication::keyboardModifiers() == Qt::AltModifier) {
+    //    };
 
-        switch (event->type())
-        {
-            case QEvent::Wheel:
-            {
-                // Scroll to zoom
-                if (auto* wheelEvent = static_cast<QWheelEvent*>(event))
-                    zoomAround(wheelEvent->position().toPoint(), wheelEvent->angleDelta().x() / 1200.f);
-
-                break;
-            }
-
-            case QEvent::MouseButtonPress:
-            {
-                if (const auto* mouseEvent = static_cast<QMouseEvent*>(event))
-                {
-                    if(mouseEvent->button() == Qt::MiddleButton)
-                        resetView();
-
-                    // Navigation
-                    if (mouseEvent->buttons() == Qt::LeftButton)
-                    {
-                        setIsNavigating(true);
-                        setCursor(Qt::ClosedHandCursor);
-                        _mousePositions << mouseEvent->pos();
-                        update();
-                    }
-                }
-
-                break;
-            }
-
-            case QEvent::MouseButtonRelease:
-            {
-                setIsNavigating(false);
-                setCursor(Qt::ArrowCursor);
-                _mousePositions.clear();
-                update();
-
-                break;
-            }
-
-            case QEvent::MouseMove:
-            {
-                if (const auto* mouseEvent = static_cast<QMouseEvent*>(event))
-                {
-                    _mousePositions << mouseEvent->pos();
+    _pointRenderer.getNavigator().initialize(this);
+}
 
-                    if (mouseEvent->buttons() == Qt::LeftButton && _mousePositions.size() >= 2) 
-                    {
-                        const auto& previousMousePosition   = _mousePositions[_mousePositions.size() - 2];
-                        const auto& currentMousePosition    = _mousePositions[_mousePositions.size() - 1];
-                        const auto panVector                = currentMousePosition - previousMousePosition;
+bool ScatterplotWidget::event(QEvent* event)
+{
+    if (!event)
+        return QOpenGLWidget::event(event);
 
-                        panBy(panVector);
-                    }
-                }
+    // Need this to receive key release events in the two-dimensional renderer
+    if (event->type() == QEvent::ShortcutOverride) {
+        const auto keyEvent = dynamic_cast<QKeyEvent*>(event);
 
-                break;
-            }
+        if (keyEvent->key() == Qt::Key_Alt) {
+            event->accept();
 
+            return QOpenGLWidget::event(event);
         }
-    
     }
 
     return QOpenGLWidget::event(event);
 }
 
-void ScatterplotWidget::resetView()
-{
-    _navigationAction.getZoomRectangleAction().setBounds(_dataRectangleAction.getBounds());
-}
-
-void ScatterplotWidget::panBy(const QPointF& to)
-{
-    auto& zoomRectangleAction = _navigationAction.getZoomRectangleAction();
-
-    const auto moveBy = QPointF(to.x() / _widgetSizeInfo.width * zoomRectangleAction.getWidth() * _widgetSizeInfo.ratioWidth * -1.f,
-                                to.y() / _widgetSizeInfo.height * zoomRectangleAction.getHeight() * _widgetSizeInfo.ratioHeight);
-
-    zoomRectangleAction.translateBy({ moveBy.x(), moveBy.y() });
-
-    update();
-}
-
-void ScatterplotWidget::zoomAround(const QPointF& at, float factor)
-{
-    auto& zoomRectangleAction = _navigationAction.getZoomRectangleAction();
-
-    // the widget might have a different aspect ratio than the square opengl viewport
-    const auto offsetBounds = QPointF(zoomRectangleAction.getWidth()  * (0.5f * (1 - _widgetSizeInfo.ratioWidth)),
-                                      zoomRectangleAction.getHeight() * (0.5f * (1 - _widgetSizeInfo.ratioHeight)) * -1.f);
-
-    const auto originBounds = QPointF(zoomRectangleAction.getLeft(), zoomRectangleAction.getTop());
-
-    // translate mouse point in widget to mouse point in bounds coordinates
-    const auto atTransformed = QPointF(at.x() / _widgetSizeInfo.width * zoomRectangleAction.getWidth() * _widgetSizeInfo.ratioWidth,
-                                       at.y() / _widgetSizeInfo.height * zoomRectangleAction.getHeight() * _widgetSizeInfo.ratioHeight * -1.f);
-
-    const auto atInBounds = originBounds + offsetBounds + atTransformed;
-
-    // ensure mouse position is the same after zooming
-    const auto currentBoundCenter = zoomRectangleAction.getCenter();
-
-    float moveMouseX = (atInBounds.x() - currentBoundCenter.first) * factor;
-    float moveMouseY = (atInBounds.y() - currentBoundCenter.second) * factor;
-
-    // zoom and move view
-    zoomRectangleAction.translateBy({ moveMouseX, moveMouseY });
-    zoomRectangleAction.expandBy(-1.f * factor);
-
-    update();
-}
-
 bool ScatterplotWidget::isInitialized() const
 {
     return _isInitialized;
diff --git a/src/ScatterplotWidget.h b/src/ScatterplotWidget.h
@@ -123,25 +123,8 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C
         return _dataRectangleAction.getBounds();
     }
 
-    /*
-    mv::Bounds getZoomBounds() const {
-        return _zoomBounds;
-    }
-
-    void setZoomBounds(const mv::Bounds& newBounds) {
-        _zoomBounds = newBounds;
-        _pointRenderer.setBounds(_zoomBounds);
-        emit zoomBoundsChanged(_zoomBounds);
-        update();
-    }
-    */
-
     NavigationAction& getNavigationAction() { return _navigationAction; }
 
-    bool isNavigating() const {
-        return _isNavigating;
-    }
-
     mv::Vector3f getColorMapRange() const;
     void setColorMapRange(const float& min, const float& max);
 
@@ -258,10 +241,6 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C
 
     bool event(QEvent* event) override;
 
-    void zoomAround(const QPointF& at, float factor);
-    void panBy(const QPointF& to);
-    void resetView();
-
 public: // Const access to renderers
 
     const PointRenderer& getPointRenderer() const {
@@ -308,9 +287,11 @@ public slots:
 private slots:
     void updatePixelRatio();
 
-private:
+protected:
     PointRenderer               _pointRenderer;                 /** For rendering point data as points */
     DensityRenderer             _densityRenderer;               /** For rendering point data as a density plot */
+
+private:
     bool                        _isInitialized;                 /** Boolean determining whether the widget it properly initialized or not */
     RenderMode                  _renderMode;                    /** Current render mode */
     QColor                      _backgroundColor;               /** Background color */
@@ -322,11 +303,10 @@ private slots:
     PixelSelectionTool          _pixelSelectionTool;            /** 2D pixel selection tool */
     PixelSelectionTool          _samplerPixelSelectionTool;     /** 2D pixel selection tool */
     float                       _pixelRatio;                    /** Current pixel ratio */
-    QVector<QPoint>             _mousePositions;                /** Recorded mouse positions */
-    bool                        _isNavigating;                  /** Boolean determining whether view navigation is currently taking place or not */
     bool                        _weightDensity;                 /** Use point scalar sizes to weight density */
 
     mv::plugin::ViewPlugin*     _parentPlugin = nullptr;
 
+    friend class ScatterplotPlugin;
     friend class NavigationAction;
 };

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ void NavigationAction::initialize(ScatterplotWidget* scatterplotWidget)`
`49`	`49`	`_scatterplotWidget = scatterplotWidget;`
`50`	`50`
`51`	`51`	`_scatterplotWidget->addAction(&_zoomDataExtentsAction);`
`52`		`-`
`53`		`- connect(&_zoomDataExtentsAction, &TriggerAction::triggered, _scatterplotWidget, &ScatterplotWidget::resetView);`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`void NavigationAction::connectToPublicAction(WidgetAction* publicAction, bool recursive)`