Align density renderer with point renderer and fix shortcuts

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -72,7 +72,8 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     shortcuts.add({ QKeySequence(Qt::ALT), "Navigation", "Pan (LMB down)" });
     shortcuts.add({ QKeySequence(Qt::ALT), "Navigation", "Zoom (mouse wheel)" });
     shortcuts.add({ QKeySequence(Qt::Key_O), "Navigation", "Original view" });
-    shortcuts.add({ QKeySequence(Qt::Key_B), "Navigation", "Zoom to selection" });
+    shortcuts.add({ QKeySequence(Qt::Key_H), "Navigation", "Zoom to selection" });
+    shortcuts.add({ QKeySequence(Qt::Key_F), "Navigation", "Zoom to window" });
 
     _dropWidget = new DropWidget(_scatterPlotWidget);
 
@@ -260,15 +261,13 @@ void ScatterplotPlugin::init()
 
     navigationLayout->addStretch(1);
     {
-        auto renderersNavigationGroupAction = new HorizontalGroupAction(this, "Renderers Navigation");
+        auto renderersNavigationGroupAction = new HorizontalGroupAction(this, "Navigation");
 
         renderersNavigationGroupAction->setShowLabels(false);
 
         renderersNavigationGroupAction->addAction(const_cast<NavigationAction*>(&_scatterPlotWidget->getPointRendererNavigator().getNavigationAction()));
-        renderersNavigationGroupAction->addAction(const_cast<NavigationAction*>(&_scatterPlotWidget->getDensityRendererNavigator().getNavigationAction()));
 
         _scatterPlotWidget->getPointRendererNavigator().getNavigationAction().setParent(&_settingsAction);
-        _scatterPlotWidget->getDensityRendererNavigator().getNavigationAction().setParent(&_settingsAction);
 
         navigationLayout->addWidget(renderersNavigationGroupAction->createWidget(&getWidget()));
     }
@@ -353,10 +352,6 @@ void ScatterplotPlugin::init()
         return pointIndicesTableWidget;
         });
 #endif
-
-    _scatterPlotWidget->updateNavigationActionVisibility();
-
-    connect(&_settingsAction.getRenderModeAction(), &OptionAction::currentIndexChanged, _scatterPlotWidget, &ScatterplotWidget::updateNavigationActionVisibility);
 }
 
 void ScatterplotPlugin::loadData(const Datasets& datasets)

src/ScatterplotWidget.cpp

@@ -128,6 +128,10 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
     _samplerPixelSelectionTool.setEnabled(true);
     _samplerPixelSelectionTool.setMainColor(QColor(Qt::black));
     _samplerPixelSelectionTool.setFixedBrushRadiusModifier(Qt::AltModifier);
+
+    getPointRendererNavigator().setEnabled(true);
+
+    _densityRenderer.setCustomNavigator(&getPointRendererNavigator());
 }
 
 bool ScatterplotWidget::event(QEvent* event)
@@ -199,27 +203,17 @@ void ScatterplotWidget::setRenderMode(const RenderMode& renderMode)
 
     emit renderModeChanged(_renderMode);
 
-    _pointRenderer.getNavigator().setEnabled(_renderMode == SCATTERPLOT);
-    _densityRenderer.getNavigator().setEnabled(_renderMode == DENSITY || _renderMode == LANDSCAPE);
-
     switch (_renderMode)
     {
         case ScatterplotWidget::SCATTERPLOT:
         {
-            getPointRendererNavigator().setEnabled(true);
-            getDensityRendererNavigator().setEnabled(false);
-
         	break;
         }
 
         case ScatterplotWidget::DENSITY:
         case ScatterplotWidget::LANDSCAPE:
         {
-            getPointRendererNavigator().setEnabled(false);
-            getDensityRendererNavigator().setEnabled(true);
-
 	        computeDensity();
-            _densityRenderer.getNavigator().resetView();
 
         	break;
         }
@@ -272,15 +266,18 @@ void ScatterplotWidget::setData(const std::vector<Vector2f>* points)
     auto dataBounds = getDataBounds(*points);
 
     _pointRenderer.setDataBounds(QRectF(QPointF(dataBounds.getLeft(), dataBounds.getBottom()), QSizeF(dataBounds.getWidth(), dataBounds.getHeight())));
-    
+    _densityRenderer.setDataBounds(QRectF(QPointF(dataBounds.getLeft(), dataBounds.getBottom()), QSizeF(dataBounds.getWidth(), dataBounds.getHeight())));
+
     _dataRectangleAction.setBounds(dataBounds);
 
-    dataBounds.ensureMinimumSize(1e-07f, 1e-07f);
-    dataBounds.makeSquare();
-    dataBounds.expand(0.1f);
+    auto densityDataBounds = dataBounds;
 
-    _densityRenderer.setDataBounds(QRectF(QPointF(dataBounds.getLeft(), dataBounds.getBottom()), QSizeF(dataBounds.getWidth(), dataBounds.getHeight())));
+    //densityDataBounds.ensureMinimumSize(1e-07f, 1e-07f);
+    //densityDataBounds.makeSquare();
+    //densityDataBounds.expand(0.1f);
 
+    _densityRenderer.setDensityComputationDataBounds(QRectF(QPointF(densityDataBounds.getLeft(), densityDataBounds.getBottom()), QSizeF(densityDataBounds.getWidth(), densityDataBounds.getHeight())));
+    
     _pointRenderer.setData(*points);
     _densityRenderer.setData(points);
 
@@ -601,12 +598,6 @@ 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/ScatterplotWidget.h

@@ -213,9 +213,6 @@ 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;