X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=ae37b912ca984c0d13f2ff371bfe53e5baa5fb3c;hp=6549e51bf85041a225b215c2268989461f7ceae1;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=39ab01e794a0c13cfc012e90dd17eaebc234fb38 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 6549e51..ae37b91 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" @@ -76,6 +77,7 @@ using pv::util::Timestamp; using std::back_inserter; using std::copy_if; +using std::count_if; using std::deque; using std::dynamic_pointer_cast; using std::inserter; @@ -89,6 +91,7 @@ using std::pair; using std::set; using std::set_difference; using std::shared_ptr; +using std::stringstream; using std::unordered_map; using std::unordered_set; using std::vector; @@ -135,8 +138,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)), @@ -155,9 +158,13 @@ View::View(Session &session, QWidget *parent) : next_flag_text_('A'), trigger_markers_(), hover_point_(-1, -1), - scroll_needs_defaults(false), - saved_v_offset_(0) + scroll_needs_defaults_(false), + 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)), @@ -219,7 +226,7 @@ const Session& View::session() const return session_; } -std::unordered_set< std::shared_ptr > View::signals() const +unordered_set< shared_ptr > View::signals() const { return signals_; } @@ -284,7 +291,7 @@ void View::save_settings(QSettings &settings) const settings.setValue("v_offset", scrollarea_.verticalScrollBar()->sliderPosition()); - std::stringstream ss; + stringstream ss; boost::archive::text_oarchive oa(ss); oa << boost::serialization::make_nvp("offset", offset_); settings.setValue("offset", QString::fromStdString(ss.str())); @@ -306,7 +313,7 @@ void View::restore_settings(QSettings &settings) if (settings.contains("offset")) { util::Timestamp offset; - std::stringstream ss; + stringstream ss; ss << settings.value("offset").toString().toStdString(); boost::archive::text_iarchive ia(ss); @@ -324,7 +331,7 @@ void View::restore_settings(QSettings &settings) if (settings.contains("v_offset")) { saved_v_offset_ = settings.value("v_offset").toInt(); set_v_offset(saved_v_offset_); - scroll_needs_defaults = false; + scroll_needs_defaults_ = false; // Note: see resizeEvent() for additional information } } @@ -557,9 +564,11 @@ pair View::get_time_extents() const return make_pair(*left_time, *right_time); } -void View::enable_sticky_scrolling(bool state) +void View::enable_show_sampling_points(bool state) { - sticky_scrolling_ = state; + (void)state; + + viewport_->update(); } void View::enable_coloured_bg(bool state) @@ -610,15 +619,15 @@ void View::centre_cursors() viewport_->update(); } -std::shared_ptr View::cursors() const +shared_ptr View::cursors() const { return cursors_; } 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); @@ -626,15 +635,15 @@ void View::add_flag(const Timestamp& time) time_item_appearance_changed(true, true); } -void View::remove_flag(std::shared_ptr flag) +void View::remove_flag(shared_ptr flag) { flags_.remove(flag); time_item_appearance_changed(true, true); } -vector< std::shared_ptr > View::flags() const +vector< shared_ptr > View::flags() const { - vector< std::shared_ptr > flags(flags_.begin(), flags_.end()); + vector< shared_ptr > flags(flags_.begin(), flags_.end()); stable_sort(flags.begin(), flags.end(), [](const shared_ptr &a, const shared_ptr &b) { return a->time() < b->time(); @@ -666,7 +675,7 @@ void View::restack_all_trace_tree_items() o->restack_items(); // Re-assign background colors - bool next_bgcolour_state = 0; + bool next_bgcolour_state = false; for (auto &o : sorted_owners) next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state); @@ -678,8 +687,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 @@ -749,7 +757,7 @@ void View::calculate_tick_spacing() // Precision is the number of fractional digits required, not // taking the prefix into account (and it must never be negative) - tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to(), 0); + tick_precision = max(ceil(log10(1 / tick_period)).convert_to(), 0); tick_period_width = (tick_period / scale_).convert_to(); @@ -811,7 +819,7 @@ void View::update_scroll() vscrollbar->setRange(extents.first - areaSize.height(), extents.second); - if (scroll_needs_defaults) + if (scroll_needs_defaults_) set_scroll_default(); } @@ -826,15 +834,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 +845,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() @@ -885,7 +889,7 @@ TraceTreeItemOwner* View::find_prevalent_trace_group( size_t max_prevalence = 0; TraceTreeItemOwner *prevalent_owner = nullptr; for (TraceTreeItemOwner *owner : owners) { - const size_t prevalence = std::count_if( + const size_t prevalence = count_if( owner_list.begin(), owner_list.end(), [&](TraceTreeItemOwner *o) { return o == owner; }); if (prevalence > max_prevalence) { @@ -974,15 +978,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 +1199,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 +1230,19 @@ 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_); + } + + // Enable sticky scrolling if the setting is enabled + sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); } if (state == Session::Stopped) { @@ -1228,8 +1252,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 +1275,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;