X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f46045ad1af482d89d0da7f00d5b853f7ae34ea6;hp=b5d7beb75d6845637fccb7e4fa1d6183e3b483a8;hb=067bb62415847791709f4c3cad8bb252a63f45f8;hpb=e62bee7326a4b04c0e914a3fa9e39d1e808821dd diff --git a/pv/view/view.cpp b/pv/view/view.cpp index b5d7beb7..f46045ad 100644 --- 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)), @@ -156,8 +157,12 @@ View::View(Session &session, QWidget *parent) : trigger_markers_(), hover_point_(-1, -1), scroll_needs_defaults_(false), - saved_v_offset_(0) + 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)), @@ -562,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> items( @@ -617,8 +627,8 @@ std::shared_ptr View::cursors() const void View::add_flag(const Timestamp& time) { - flags_.push_back(shared_ptr(new Flag(*this, time, - QString("%1").arg(next_flag_text_)))); + flags_.push_back(make_shared(*this, time, + QString("%1").arg(next_flag_text_))); next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' : (next_flag_text_ + 1); @@ -678,8 +688,7 @@ void View::restack_all_trace_tree_items() void View::trigger_event(util::Timestamp location) { - trigger_markers_.push_back(shared_ptr( - new TriggerMarker(*this, location))); + trigger_markers_.push_back(make_shared(*this, location)); } void View::get_scroll_layout(double &length, Timestamp &offset) const @@ -826,15 +835,6 @@ void View::set_scroll_default() const QSize areaSize = viewport_->size(); - // Special case: when starting up and the window isn't visible yet, - // areaSize is [0, 0]. In this case we want to be called again later - if (areaSize.height() == 0) { - scroll_needs_defaults_ = true; - return; - } else { - scroll_needs_defaults_ = false; - } - const pair extents = v_extents(); const int trace_height = extents.second - extents.first; @@ -846,6 +846,11 @@ void View::set_scroll_default() else // Put the first trace at the top, letting the bottom ones overflow set_v_offset(extents.first); + + // If we're not sure whether setting the defaults worked as + // the window wasn't set up entirely yet, we want to be called + // again later to make sure + scroll_needs_defaults_ = !size_finalized_; } void View::update_layout() @@ -974,15 +979,22 @@ void View::resizeEvent(QResizeEvent*) // set_v_offset() from within restore_settings() as the view // at that point is neither visible nor properly sized. // This is the least intrusive workaround I could come up - // with: set the vertical offset when the view is visible and - // resized to its final size. Resize events that are sent - // when the view is invisible must be ignored as they have - // wrong sizes, potentially preventing the v offset to be - // set successfully. - if (isVisible() && saved_v_offset_) { + // with: set the vertical offset (or scroll defaults) when + // the view is visible and resized to its final size. + // Resize events that are sent when the view is not visible + // must be ignored as they have wrong sizes, potentially + // preventing the v offset from being set successfully. + + if (isVisible()) + size_finalized_ = true; + + if (size_finalized_ && saved_v_offset_) { set_v_offset(saved_v_offset_); saved_v_offset_ = 0; } + + if (size_finalized_ && scroll_needs_defaults_) + set_scroll_default(); } void View::row_item_appearance_changed(bool label, bool content) @@ -1188,11 +1200,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 extents = item->v_extents(); if (item->enabled()) @@ -1219,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) { @@ -1228,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_); } } } @@ -1249,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;