Add a toggle to freeze zooming (#140)

* Add zoom freeze toggle action to navigation action

* Also conditionally set the point renderer view bounds

* Also check for project loading

* Partially revert last commit that introduced a bug

Author: ThomasKroes

src/NavigationAction.cpp

@@ -13,13 +13,15 @@ NavigationAction::NavigationAction(QObject* parent, const QString& title) :
     HorizontalGroupAction(parent, title),
     _scatterplotWidget(nullptr),
     _zoomRectangleAction(this, "Zoom Rectangle"),
-    _zoomDataExtentsAction(this, "Zoom to data extents")
+    _zoomDataExtentsAction(this, "Zoom to data extents"),
+    _freezeZoomAction(this, "Freeze zoom")
 {
     setIcon(mv::Application::getIconFont("FontAwesome").getIcon("image"));
     setShowLabels(false);
 
     addAction(&_zoomRectangleAction);
     addAction(&_zoomDataExtentsAction);
+    addAction(&_freezeZoomAction);
 
     auto& fontAwesome = Application::getIconFont("FontAwesome");
 
@@ -34,6 +36,9 @@ NavigationAction::NavigationAction(QObject* parent, const QString& title) :
     _zoomDataExtentsAction.setConnectionPermissionsToForceNone(true);
     _zoomDataExtentsAction.setShortcutContext(Qt::WidgetWithChildrenShortcut);
     _zoomDataExtentsAction.setShortcut(QKeySequence("Alt+O"));
+
+    _freezeZoomAction.setToolTip("Freeze the zoom extents");
+    _freezeZoomAction.setConnectionPermissionsToForceNone(true);
 }
 
 void NavigationAction::initialize(ScatterplotWidget* scatterplotWidget)
@@ -84,6 +89,7 @@ void NavigationAction::fromVariantMap(const QVariantMap& variantMap)
 
     _zoomRectangleAction.fromParentVariantMap(variantMap);
     _zoomDataExtentsAction.fromParentVariantMap(variantMap);
+    _freezeZoomAction.fromParentVariantMap(variantMap);
 }
 
 QVariantMap NavigationAction::toVariantMap() const
@@ -92,6 +98,7 @@ QVariantMap NavigationAction::toVariantMap() const
 
     _zoomRectangleAction.insertIntoVariantMap(variantMap);
     _zoomDataExtentsAction.insertIntoVariantMap(variantMap);
+    _freezeZoomAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
 }

src/NavigationAction.h

@@ -3,6 +3,7 @@
 #include <actions/HorizontalGroupAction.h>
 #include <actions/DecimalRectangleAction.h>
 #include <actions/TriggerAction.h>
+#include <actions/ToggleAction.h>
 
 using namespace mv::gui;
 
@@ -66,11 +67,13 @@ class NavigationAction : public HorizontalGroupAction
 
     DecimalRectangleAction& getZoomRectangleAction() { return _zoomRectangleAction; }
     TriggerAction& getZoomDataExtentsAction() { return _zoomDataExtentsAction; }
+    ToggleAction& getFreezeZoomAction() { return _freezeZoomAction; }
 
 private:
     ScatterplotWidget*      _scatterplotWidget;         /** Pointer to owning scatterplot widget */
     DecimalRectangleAction  _zoomRectangleAction;       /** Rectangle action for setting the current zoom bounds */
     TriggerAction           _zoomDataExtentsAction;     /** Trigger action to zoom to data extents */
+    ToggleAction            _freezeZoomAction;          /** Action for toggling the zoom rectangle freeze */
 
     friend class mv::AbstractActionsManager;
 };

src/ScatterplotWidget.cpp

@@ -1,5 +1,7 @@
 #include "ScatterplotWidget.h"
 
+#include <CoreInterface.h>
+
 #include <util/Exception.h>
 
 #include <vector>
@@ -389,11 +391,17 @@ void ScatterplotWidget::setData(const std::vector<Vector2f>* points)
     dataBounds.makeSquare();
     dataBounds.expand(0.1f);
 
-    _pointRenderer.setViewBounds(dataBounds);
+    const auto shouldSetBounds = (mv::projects().isOpeningProject() || mv::projects().isImportingProject()) ? false : !_navigationAction.getFreezeZoomAction().isChecked();
+
+    if (shouldSetBounds)
+        _pointRenderer.setViewBounds(dataBounds);
+
     _densityRenderer.setBounds(dataBounds);
 
     _dataRectangleAction.setBounds(dataBounds);
-    _navigationAction.getZoomRectangleAction().setBounds(dataBounds);
+
+    if (shouldSetBounds)
+        _navigationAction.getZoomRectangleAction().setBounds(dataBounds);
 
     _pointRenderer.setData(*points);
     _densityRenderer.setData(points);