Prefer std::make_shared().

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index f6048f0401c3c8a16826307528f2861b2fbb31db..f46045ad1af482d89d0da7f00d5b853f7ae34ea6 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -136,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)),
@@ -627,8 +627,8 @@ std::shared_ptr<CursorPair> View::cursors() const
 
 void View::add_flag(const Timestamp& time)
 {
-       flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-               QString("%1").arg(next_flag_text_))));
+       flags_.push_back(make_shared<Flag>(*this, time,
+               QString("%1").arg(next_flag_text_)));
 
        next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
                (next_flag_text_ + 1);
@@ -688,8 +688,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-       trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-               new TriggerMarker(*this, location)));
+       trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -1232,6 +1231,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) {
@@ -1241,8 +1250,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_);
                }
        }
 }
@@ -1262,10 +1273,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;