Revamp bottom toolbar

Author: ThomasKroes

CMakeLists.txt

@@ -78,8 +78,6 @@ set(Actions
     src/ExportAction.cpp
     src/DatasetsAction.h
     src/DatasetsAction.cpp
-    src/NavigationAction.h
-    src/NavigationAction.cpp
 )
 
 set(Models

src/NavigationAction.cpp

@@ -47,8 +47,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     _scatterPlotWidget(new ScatterplotWidget(this)),
     _numPoints(0),
     _settingsAction(this, "Settings"),
-    _primaryToolbarAction(this, "Primary Toolbar"),
-    _secondaryToolbarAction(this, "Secondary Toolbar")
+    _primaryToolbarAction(this, "Primary Toolbar")
 {
     setObjectName("Scatterplot");
 
@@ -105,11 +104,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());
-    _secondaryToolbarAction.addAction(&_scatterPlotWidget->getNavigationAction());
+    //_secondaryToolbarAction.addAction(&_settingsAction.getMiscellaneousAction());
 
     connect(_scatterPlotWidget, &ScatterplotWidget::customContextMenuRequested, this, [this](const QPoint& point) {
         if (!_positionDataset.isValid())
@@ -252,7 +247,23 @@ void ScatterplotPlugin::init()
     layout->setSpacing(0);
     layout->addWidget(_primaryToolbarAction.createWidget(&getWidget()));
     layout->addWidget(_scatterPlotWidget, 100);
-    layout->addWidget(_secondaryToolbarAction.createWidget(&getWidget()));
+
+    auto navigationLayout = new QHBoxLayout();
+
+    navigationLayout->addStretch(1);
+    {
+        auto renderersNavigationGroupAction = new HorizontalGroupAction(this, "Renderers Navigation");
+
+        renderersNavigationGroupAction->setShowLabels(false);
+
+        renderersNavigationGroupAction->addAction(const_cast<NavigationAction*>(&_scatterPlotWidget->getPointRenderer().getNavigator().getNavigationAction()));
+        renderersNavigationGroupAction->addAction(const_cast<NavigationAction*>(&_scatterPlotWidget->getDensityRenderer().getNavigator().getNavigationAction()));
+
+        navigationLayout->addWidget(renderersNavigationGroupAction->createWidget(&getWidget()));
+    }
+    navigationLayout->addStretch(1);
+
+    layout->addLayout(navigationLayout);
 
     getWidget().setLayout(layout);
 
@@ -325,6 +336,10 @@ void ScatterplotPlugin::init()
         return pointIndicesTableWidget;
         });
 #endif
+
+    _scatterPlotWidget->updateNavigationActionVisibility();
+
+    connect(&_settingsAction.getRenderModeAction(), &OptionAction::currentIndexChanged, _scatterPlotWidget, &ScatterplotWidget::updateNavigationActionVisibility);
 }
 
 void ScatterplotPlugin::loadData(const Datasets& datasets)
@@ -804,7 +819,6 @@ void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)
     variantMapMustContain(variantMap, "Settings");
 
     _primaryToolbarAction.fromParentVariantMap(variantMap);
-    _secondaryToolbarAction.fromParentVariantMap(variantMap);
     _settingsAction.fromParentVariantMap(variantMap);
 
     _scatterPlotWidget->getNavigationAction().fromParentVariantMap(variantMap);
@@ -815,7 +829,6 @@ QVariantMap ScatterplotPlugin::toVariantMap() const
     QVariantMap variantMap = ViewPlugin::toVariantMap();
 
     _primaryToolbarAction.insertIntoVariantMap(variantMap);
-    _secondaryToolbarAction.insertIntoVariantMap(variantMap);
     _settingsAction.insertIntoVariantMap(variantMap);
 
     _scatterPlotWidget->getNavigationAction().insertIntoVariantMap(variantMap);
@@ -916,5 +929,5 @@ PluginTriggerActions ScatterplotPluginFactory::getPluginTriggerActions(const mv:
 
 QUrl ScatterplotPluginFactory::getRepositoryUrl() const
 {
-    return QUrl("https://github.com/ManiVaultStudio/Scatterplot");
+    return { "https://github.com/ManiVaultStudio/Scatterplot" };
 }

src/NavigationAction.h

@@ -119,7 +119,6 @@ class ScatterplotPlugin : public ViewPlugin
 
     SettingsAction                  _settingsAction;            /** Group action for all settings */
     HorizontalToolbarAction         _primaryToolbarAction;      /** Horizontal toolbar for primary content */
-    HorizontalToolbarAction         _secondaryToolbarAction;    /** Secondary toolbar for secondary content */
 
     static const std::int32_t LAZY_UPDATE_INTERVAL = 2;
 

src/ScatterplotPlugin.cpp

@@ -57,8 +57,6 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
     grabGesture(Qt::PinchGesture);
     installEventFilter(this);
 
-    _navigationAction.initialize(this);
-
     _pixelSelectionTool.setEnabled(true);
     _pixelSelectionTool.setMainColor(QColor(Qt::black));
     _pixelSelectionTool.setFixedBrushRadiusModifier(Qt::AltModifier);
@@ -111,10 +109,6 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
         QObject::connect(winHandle, &QWindow::screenChanged, this, &ScatterplotWidget::updatePixelRatio, Qt::UniqueConnection);
     });
 
-    connect(&_navigationAction.getZoomDataExtentsAction(), &TriggerAction::triggered, this, [this]() -> void {
-        _pointRenderer.getNavigator().resetView();
-    });
-
     connect(&_pointRenderer.getNavigator(), &Navigator2D::isNavigatingChanged, this, [this](bool isNavigating) -> void {
         _pixelSelectionTool.setEnabled(!isNavigating);
 
@@ -126,6 +120,7 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
         }
 	});
 
+    /*
     const auto zoomRectangleChanged = [this]() -> void {
         _pointRenderer.getNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
         _densityRenderer.getNavigator().setZoomRectangleWorld(_navigationAction.getZoomRectangleAction().toRectF());
@@ -166,6 +161,7 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 
         update();
 	});
+    */
 
     _pointRenderer.getNavigator().initialize(this);
     _densityRenderer.getNavigator().initialize(this);
@@ -642,6 +638,12 @@ bool ScatterplotWidget::getRandomizedDepthEnabled() const
     return _pointRenderer.getRandomizedDepthEnabled();
 }
 
+void ScatterplotWidget::updateNavigationActionVisibility()
+{
+    _pointRenderer.getNavigator().getNavigationAction().setVisible(getRenderMode() == ScatterplotWidget::SCATTERPLOT);
+    _densityRenderer.getNavigator().getNavigationAction().setVisible(getRenderMode() == ScatterplotWidget::DENSITY || getRenderMode() == ScatterplotWidget::LANDSCAPE);
+}
+
 void ScatterplotWidget::initializeGL()
 {
     initializeOpenGLFunctions();

src/ScatterplotPlugin.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "NavigationAction.h"
-
 #include <renderers/DensityRenderer.h>
 #include <renderers/PointRenderer.h>
 
@@ -217,6 +215,9 @@ class ScatterplotWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_C
      */
     bool getRandomizedDepthEnabled() const;
 
+    /** Toggles the point vs density and landscape renderer visibility based on the current render mode */
+    void updateNavigationActionVisibility();
+
 protected:
     void initializeGL()         Q_DECL_OVERRIDE;
     void resizeGL(int w, int h) Q_DECL_OVERRIDE;