TraceView: Fix "always zoom to fit" feature

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 546176b44acccb187086654522ac1966db1ad234..23de2087c94120e030834c9e1dfb0e8ec6312952 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -57,6 +57,7 @@
 #include "viewport.hpp"
 
 #include "pv/session.hpp"
+#include "pv/globalsettings.hpp"
 #include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
@@ -135,8 +136,8 @@ bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
        }
 }
 
-View::View(Session &session, QWidget *parent) :
-       ViewBase(session, parent),
+View::View(Session &session, bool is_main_view, QWidget *parent) :
+       ViewBase(session, is_main_view, parent),
        viewport_(new Viewport(*this)),
        ruler_(new Ruler(*this)),
        header_(new Header(*this)),
@@ -159,6 +160,9 @@ View::View(Session &session, QWidget *parent) :
        saved_v_offset_(0),
        size_finalized_(false)
 {
+       GlobalSettings settings;
+       coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
        connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
        connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
@@ -563,6 +567,11 @@ void View::enable_sticky_scrolling(bool state)
        sticky_scrolling_ = state;
 }
 
+void View::toggle_sticky_scrolling(void)
+{
+       sticky_scrolling_ = !sticky_scrolling_;
+}
+
 void View::enable_coloured_bg(bool state)
 {
        const vector<shared_ptr<TraceTreeItem>> items(
@@ -1192,11 +1201,11 @@ void View::signals_changed()
                }
 
        // Add and position the pending top levels items
+       int offset = v_extents().second;
        for (auto item : new_top_level_items) {
                add_child_item(item);
 
                // Position the item after the last item or at the top if there is none
-               int offset = v_extents().second;
                const pair<int, int> extents = item->v_extents();
 
                if (item->enabled())
@@ -1223,6 +1232,16 @@ void View::capture_state_updated(int state)
                set_time_unit(util::TimeUnit::Samples);
 
                trigger_markers_.clear();
+
+               // Activate "always zoom to fit" if the setting is enabled and we're
+               // the main view of this session (other trace views may be used for
+               // zooming and we don't want to mess them up)
+               GlobalSettings settings;
+               bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
+               if (is_main_view_ && state) {
+                       always_zoom_to_fit_ = true;
+                       always_zoom_to_fit_changed(always_zoom_to_fit_);
+               }
        }
 
        if (state == Session::Stopped) {
@@ -1232,8 +1251,10 @@ void View::capture_state_updated(int state)
 
                // Reset "always zoom to fit", the acquisition has stopped
                if (always_zoom_to_fit_) {
+                       // Perform a final zoom-to-fit before disabling
+                       zoom_fit(always_zoom_to_fit_);
                        always_zoom_to_fit_ = false;
-                       always_zoom_to_fit_changed(false);
+                       always_zoom_to_fit_changed(always_zoom_to_fit_);
                }
        }
 }
@@ -1253,10 +1274,9 @@ void View::data_updated()
 
 void View::perform_delayed_view_update()
 {
-       if (always_zoom_to_fit_)
+       if (always_zoom_to_fit_) {
                zoom_fit(true);
-
-       if (sticky_scrolling_) {
+       } else if (sticky_scrolling_) {
                // Make right side of the view sticky
                double length = 0;
                Timestamp offset;