Work on incorporating the navigation action

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -69,8 +69,6 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
 
     _dropWidget = new DropWidget(_scatterPlotWidget);
 
-    _scatterPlotWidget->getNavigationAction().setParent(this);
-
     getWidget().setFocusPolicy(Qt::ClickFocus);
 
     _primaryToolbarAction.addAction(&_settingsAction.getDatasetsAction());
@@ -820,8 +818,6 @@ void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)
 
     _primaryToolbarAction.fromParentVariantMap(variantMap);
     _settingsAction.fromParentVariantMap(variantMap);
-    
-    _scatterPlotWidget->getNavigationAction().fromParentVariantMap(variantMap);
 }
 
 QVariantMap ScatterplotPlugin::toVariantMap() const
@@ -831,8 +827,6 @@ QVariantMap ScatterplotPlugin::toVariantMap() const
     _primaryToolbarAction.insertIntoVariantMap(variantMap);
     _settingsAction.insertIntoVariantMap(variantMap);
 
-    _scatterPlotWidget->getNavigationAction().insertIntoVariantMap(variantMap);
-
     return variantMap;
 }
 

src/ScatterplotWidget.cpp

@@ -43,7 +43,6 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
     _backgroundColor(255, 255, 255, 255),
     _coloringMode(ColoringMode::Constant),
     _dataRectangleAction(this, "Data rectangle"),
-    _navigationAction(this, "Navigation"),
     _pixelSelectionTool(this),
     _samplerPixelSelectionTool(this),
     _pixelRatio(1.0),
@@ -120,10 +119,13 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
         }
 	});
 
+    connect(&getPointRendererNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this]() -> void { update(); });
+    connect(&getDensityRendererNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this]() -> void { update(); });
+
     /*
     const auto zoomRectangleChanged = [this]() -> void {
-        _pointRenderer.getNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
-        _densityRenderer.getNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
+        _pointRenderer.getPointRendererNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
+        _densityRenderer.getPointRendererNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
 
         update();
 	};
@@ -132,10 +134,10 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 
     connect(&_navigationAction.getZoomRectangleAction(), &DecimalRectangleAction::rectangleChanged, this, zoomRectangleChanged);
 
-    connect(&_pointRenderer.getNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this, zoomRectangleChanged](const QRectF& previousZoomRectangleWorld, const QRectF& currentZoomRectangleWorld) -> void {
+    connect(&_pointRenderer.getPointRendererNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this, zoomRectangleChanged](const QRectF& previousZoomRectangleWorld, const QRectF& currentZoomRectangleWorld) -> void {
         disconnect(&_navigationAction.getZoomRectangleAction(), &DecimalRectangleAction::rectangleChanged, this, nullptr);
         {
-            _navigationAction.getZoomDataExtentsAction().setEnabled(_pointRenderer.getNavigator().hasUserNavigated());
+            _navigationAction.getZoomDataExtentsAction().setEnabled(_pointRenderer.getPointRendererNavigator().hasUserNavigated());
 
         	_navigationAction.getZoomRectangleAction().setLeft(currentZoomRectangleWorld.left());
             _navigationAction.getZoomRectangleAction().setRight(currentZoomRectangleWorld.right());
@@ -147,10 +149,10 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 	    update();
     });
 
-    connect(&_densityRenderer.getNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this, zoomRectangleChanged](const QRectF& previousZoomRectangleWorld, const QRectF& currentZoomRectangleWorld) -> void {
+    connect(&_densityRenderer.getPointRendererNavigator(), &Navigator2D::zoomRectangleWorldChanged, this, [this, zoomRectangleChanged](const QRectF& previousZoomRectangleWorld, const QRectF& currentZoomRectangleWorld) -> void {
         disconnect(&_navigationAction.getZoomRectangleAction(), &DecimalRectangleAction::rectangleChanged, this, nullptr);
         {
-            _navigationAction.getZoomDataExtentsAction().setEnabled(_pointRenderer.getNavigator().hasUserNavigated());
+            _navigationAction.getZoomDataExtentsAction().setEnabled(_pointRenderer.getPointRendererNavigator().hasUserNavigated());
 
             _navigationAction.getZoomRectangleAction().setLeft(currentZoomRectangleWorld.left());
             _navigationAction.getZoomRectangleAction().setRight(currentZoomRectangleWorld.right());

src/ScatterplotWidget.h

@@ -113,8 +113,6 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C
         return _dataRectangleAction.getBounds();
     }
 
-    NavigationAction& getNavigationAction() { return _navigationAction; }
-
     mv::Vector3f getColorMapRange() const;
     void setColorMapRange(const float& min, const float& max);
 
@@ -249,6 +247,20 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C
     /** Assign a color map image to the point and density renderers */
     void setColorMap(const QImage& colorMapImage);
 
+public: // Navigators
+
+    /**
+     * Get the navigator for the point renderer
+     * @return Reference to the navigator
+     */
+    mv::Navigator2D& getPointRendererNavigator() { return _pointRenderer.getNavigator(); }
+
+    /**
+     * Get the navigator for the density renderer
+     * @return Reference to the navigator
+     */
+    mv::Navigator2D& getDensityRendererNavigator() { return _densityRenderer.getNavigator(); }
+
 signals:
     void initialized();
     void created();
@@ -290,7 +302,6 @@ private slots:
     QColor                      _backgroundColor;               /** Background color */
     ColoringMode                _coloringMode;                  /** Type of point/density coloring */
     DecimalRectangleAction      _dataRectangleAction;           /** Rectangle action for the bounds of the loaded data */
-    NavigationAction            _navigationAction;              /** All navigation-related actions are grouped in this action */
     QImage                      _colorMapImage;                 /** 1D/2D color map image */
     PixelSelectionTool          _pixelSelectionTool;            /** 2D pixel selection tool */
     PixelSelectionTool          _samplerPixelSelectionTool;     /** 2D pixel selection tool */

src/SettingsAction.cpp

@@ -6,6 +6,8 @@
 
 #include <QMenu>
 
+#include "ScatterplotWidget.h"
+
 using namespace mv::gui;
 
 SettingsAction::SettingsAction(QObject* parent, const QString& title) :
@@ -71,6 +73,12 @@ void SettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _renderModeAction.fromParentVariantMap(variantMap);
     _selectionAction.fromParentVariantMap(variantMap);
     _miscellaneousAction.fromParentVariantMap(variantMap);
+
+    if (variantMap.contains("PointRendererNavigation"))
+		_scatterplotPlugin->getScatterplotWidget().getPointRendererNavigator().getNavigationAction().fromVariantMap(variantMap["PointRendererNavigation"].toMap());
+
+    if (variantMap.contains("DensityRendererNavigation"))
+        _scatterplotPlugin->getScatterplotWidget().getDensityRendererNavigator().getNavigationAction().fromVariantMap(variantMap["DensityRendererNavigation"].toMap());
 }
 
 QVariantMap SettingsAction::toVariantMap() const
@@ -85,5 +93,8 @@ QVariantMap SettingsAction::toVariantMap() const
     _selectionAction.insertIntoVariantMap(variantMap);
     _miscellaneousAction.insertIntoVariantMap(variantMap);
 
+    variantMap["PointRendererNavigation"]   = _scatterplotPlugin->getScatterplotWidget().getPointRendererNavigator().getNavigationAction().toVariantMap();
+    variantMap["DensityRendererNavigation"] = _scatterplotPlugin->getScatterplotWidget().getDensityRendererNavigator().getNavigationAction().toVariantMap();
+
     return variantMap;
 }