X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3f0fe9d1dc9991febf113d45f02f5dc6189c0ace;hp=5e89397aec8e5e71c7732bd7e27faedadb20f40d;hb=cef5997ee1e08d713663d2ae02c839a315f41409;hpb=f84000171de7e569590a2f766ae36290b73442da diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 5e89397a..3f0fe9d1 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -24,9 +24,11 @@ #include +#include #include #include #include +#include #include #include @@ -36,7 +38,7 @@ #include #include -#include +#include #include "decodetrace.hpp" #include "header.hpp" @@ -48,6 +50,7 @@ #include "viewport.hpp" #include "pv/session.hpp" +#include "pv/devices/device.hpp" #include "pv/data/logic.hpp" #include "pv/data/logicsegment.hpp" #include "pv/util.hpp" @@ -57,10 +60,12 @@ using boost::shared_mutex; using pv::data::SignalData; using pv::data::Segment; -using pv::util::format_time; +using pv::util::TimeUnit; +using pv::util::Timestamp; using std::deque; using std::dynamic_pointer_cast; +using std::inserter; using std::list; using std::lock_guard; using std::max; @@ -68,6 +73,7 @@ using std::make_pair; using std::min; using std::pair; using std::set; +using std::set_difference; using std::shared_ptr; using std::unordered_map; using std::unordered_set; @@ -77,10 +83,11 @@ using std::weak_ptr; namespace pv { namespace view { -const double View::MaxScale = 1e9; -const double View::MinScale = 1e-15; +const Timestamp View::MaxScale("1e9"); +const Timestamp View::MinScale("1e-12"); const int View::MaxScrollValue = INT_MAX / 2; +const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky scrolling const int View::ScaleUnits[3] = {1, 2, 5}; @@ -90,11 +97,15 @@ View::View(Session &session, QWidget *parent) : viewport_(new Viewport(*this)), ruler_(new Ruler(*this)), header_(new Header(*this)), - scale_(1e-6), + scale_(1e-3), offset_(0), updating_scroll_(false), - tick_period_(0.0), - tick_prefix_(0), + sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui() + always_zoom_to_fit_(false), + tick_period_(0), + tick_prefix_(pv::util::SIPrefix::yocto), + tick_precision_(0), + time_unit_(util::TimeUnit::Time), show_cursors_(false), cursors_(new CursorPair(*this)), next_flag_text_('A'), @@ -108,7 +119,7 @@ View::View(Session &session, QWidget *parent) : connect(&session_, SIGNAL(signals_changed()), this, SLOT(signals_changed())); connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(data_updated())); + this, SLOT(capture_state_updated(int))); connect(&session_, SIGNAL(data_received()), this, SLOT(data_updated())); connect(&session_, SIGNAL(frame_ended()), @@ -131,6 +142,11 @@ View::View(Session &session, QWidget *parent) : this, SLOT(process_sticky_events())); lazy_event_handler_.setSingleShot(true); + connect(&delayed_view_updater_, SIGNAL(timeout()), + this, SLOT(perform_delayed_view_update())); + delayed_view_updater_.setSingleShot(true); + delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate); + setViewport(viewport_); viewport_->installEventFilter(this); @@ -194,31 +210,96 @@ double View::scale() const return scale_; } -double View::offset() const +void View::set_scale(double scale) +{ + if (scale_ != scale) { + scale_ = scale; + Q_EMIT scale_changed(); + } +} + +const Timestamp& View::offset() const { return offset_; } +void View::set_offset(const pv::util::Timestamp& offset) +{ + if (offset_ != offset) { + offset_ = offset; + Q_EMIT offset_changed(); + } +} + int View::owner_visual_v_offset() const { return -verticalScrollBar()->sliderPosition(); } +void View::set_v_offset(int offset) +{ + verticalScrollBar()->setSliderPosition(offset); + header_->update(); + viewport_->update(); +} + unsigned int View::depth() const { return 0; } -unsigned int View::tick_prefix() const +pv::util::SIPrefix View::tick_prefix() const { return tick_prefix_; } -double View::tick_period() const +void View::set_tick_prefix(pv::util::SIPrefix tick_prefix) +{ + if (tick_prefix_ != tick_prefix) { + tick_prefix_ = tick_prefix; + Q_EMIT tick_prefix_changed(); + } +} + +unsigned int View::tick_precision() const +{ + return tick_precision_; +} + +void View::set_tick_precision(unsigned tick_precision) +{ + if (tick_precision_ != tick_precision) { + tick_precision_ = tick_precision; + Q_EMIT tick_precision_changed(); + } +} + +const pv::util::Timestamp& View::tick_period() const { return tick_period_; } +void View::set_tick_period(const pv::util::Timestamp& tick_period) +{ + if (tick_period_ != tick_period) { + tick_period_ = tick_period; + Q_EMIT tick_period_changed(); + } +} + +TimeUnit View::time_unit() const +{ + return time_unit_; +} + +void View::set_time_unit(pv::util::TimeUnit time_unit) +{ + if (time_unit_ != time_unit) { + time_unit_ = time_unit; + Q_EMIT time_unit_changed(); + } +} + void View::zoom(double steps) { zoom(steps, viewport_->width() / 2); @@ -229,11 +310,20 @@ void View::zoom(double steps, int offset) set_zoom(scale_ * pow(3.0/2.0, -steps), offset); } -void View::zoom_fit() +void View::zoom_fit(bool gui_state) { - const pair extents = get_time_extents(); - const double delta = extents.second - extents.first; - if (delta < 1e-12) + // Act as one-shot when stopped, toggle along with the GUI otherwise + if (session_.get_capture_state() == Session::Stopped) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } else { + always_zoom_to_fit_ = gui_state; + always_zoom_to_fit_changed(gui_state); + } + + const pair extents = get_time_extents(); + const Timestamp delta = extents.second - extents.first; + if (delta < Timestamp("1e-12")) return; assert(viewport_); @@ -241,8 +331,8 @@ void View::zoom_fit() if (w <= 0) return; - const double scale = max(min(delta / w, MaxScale), MinScale); - set_scale_offset(scale, extents.first); + const Timestamp scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale.convert_to(), extents.first); } void View::zoom_one_to_one() @@ -274,23 +364,38 @@ void View::zoom_one_to_one() set_zoom(1.0 / samplerate, w / 2); } -void View::set_scale_offset(double scale, double offset) +void View::set_scale_offset(double scale, const Timestamp& offset) { - scale_ = scale; - offset_ = offset; + // Disable sticky scrolling / always zoom to fit when acquisition runs + // and user drags the viewport + if ((scale_ == scale) && (offset_ != offset) && + (session_.get_capture_state() == Session::Running)) { + + if (sticky_scrolling_) { + sticky_scrolling_ = false; + sticky_scrolling_changed(false); + } + + if (always_zoom_to_fit_) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } + } + + set_scale(scale); + set_offset(offset); calculate_tick_spacing(); update_scroll(); ruler_->update(); viewport_->update(); - scale_offset_changed(); } set< shared_ptr > View::get_visible_data() const { shared_lock lock(session().signals_mutex()); - const vector< shared_ptr > &sigs(session().signals()); + const unordered_set< shared_ptr > &sigs(session().signals()); // Make a set of all the visible data objects set< shared_ptr > visible_data; @@ -301,9 +406,9 @@ set< shared_ptr > View::get_visible_data() const return visible_data; } -pair View::get_time_extents() const +pair View::get_time_extents() const { - double left_time = DBL_MAX, right_time = DBL_MIN; + boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); for (const shared_ptr d : visible_data) { @@ -313,18 +418,26 @@ pair View::get_time_extents() const double samplerate = s->samplerate(); samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; - const double start_time = s->start_time(); - left_time = min(left_time, start_time); - right_time = max(right_time, start_time + - d->get_max_sample_count() / samplerate); + const Timestamp start_time = s->start_time(); + left_time = left_time ? + min(*left_time, start_time) : + start_time; + right_time = right_time ? + max(*right_time, start_time + d->max_sample_count() / samplerate) : + start_time + d->max_sample_count() / samplerate; } } - if (left_time == DBL_MAX && right_time == DBL_MIN) - return make_pair(0.0, 0.0); + if (!left_time || !right_time) + return make_pair(0, 0); - assert(left_time < right_time); - return make_pair(left_time, right_time); + assert(*left_time < *right_time); + return make_pair(*left_time, *right_time); +} + +void View::enable_sticky_scrolling(bool state) +{ + sticky_scrolling_ = state; } bool View::cursors_shown() const @@ -353,7 +466,7 @@ std::shared_ptr View::cursors() const return cursors_; } -void View::add_flag(double time) +void View::add_flag(const Timestamp& time) { flags_.push_back(shared_ptr(new Flag(*this, time, QString("%1").arg(next_flag_text_)))); @@ -391,17 +504,13 @@ void View::update_viewport() header_->update(); } -void View::restack_all_row_items() +void View::restack_all_trace_tree_items() { - // Make a set of owners - unordered_set< RowItemOwner* > owners; - for (const auto &r : *this) - owners.insert(r->owner()); - - // Make a list that is sorted from deepest first - vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); + // Make a list of owners that is sorted from deepest first + const auto owners = list_row_item_owners(); + vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end()); sort(sorted_owners.begin(), sorted_owners.end(), - [](const RowItemOwner* a, const RowItemOwner *b) { + [](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) { return a->depth() > b->depth(); }); // Restack the items recursively @@ -409,57 +518,96 @@ void View::restack_all_row_items() o->restack_items(); // Animate the items to their destination - for (const auto &r : *this) - r->animate_to_layout_v_offset(); + const vector< shared_ptr > items( + list_by_type()); + for (const auto &i : items) + i->animate_to_layout_v_offset(); } -void View::get_scroll_layout(double &length, double &offset) const +void View::get_scroll_layout(double &length, Timestamp &offset) const { - const pair extents = get_time_extents(); - length = (extents.second - extents.first) / scale_; + const pair extents = get_time_extents(); + length = ((extents.second - extents.first) / scale_).convert_to(); offset = offset_ / scale_; } void View::set_zoom(double scale, int offset) { - const double cursor_offset = offset_ + scale_ * offset; - const double new_scale = max(min(scale, MaxScale), MinScale); - const double new_offset = cursor_offset - new_scale * offset; - set_scale_offset(new_scale, new_offset); + // Reset the "always zoom to fit" feature as the user changed the zoom + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + + const Timestamp cursor_offset = offset_ + scale_ * offset; + const Timestamp new_scale = max(min(Timestamp(scale), MaxScale), MinScale); + const Timestamp new_offset = cursor_offset - new_scale * offset; + set_scale_offset(new_scale.convert_to(), new_offset); } void View::calculate_tick_spacing() { - const double SpacingIncrement = 32.0f; - const double MinValueSpacing = 32.0f; + const double SpacingIncrement = 10.0f; + const double MinValueSpacing = 40.0f; + + // Figure out the highest numeric value visible on a label + const QSize areaSize = viewport_->size(); + const Timestamp max_time = max(fabs(offset_), + fabs(offset_ + scale_ * areaSize.width())); - double min_width = SpacingIncrement, typical_width; + double min_width = SpacingIncrement; + double label_width, tick_period_width; QFontMetrics m(QApplication::font()); + // Copies of the member variables with the same name, used in the calculation + // and written back afterwards, so that we don't emit signals all the time + // during the calculation. + pv::util::Timestamp tick_period = tick_period_; + pv::util::SIPrefix tick_prefix = tick_prefix_; + unsigned tick_precision = tick_precision_; + do { const double min_period = scale_ * min_width; const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10.0, order); - + const pv::util::Timestamp order_decimal = + pow(pv::util::Timestamp(10), order); + + // Allow for a margin of error so that a scale unit of 1 can be used. + // Otherwise, for a SU of 1 the tick period will almost always be below + // the min_period by a small amount - and thus skipped in favor of 2. + // Note: margin assumes that SU[0] and SU[1] contain the smallest values + double tp_margin = (ScaleUnits[0] + ScaleUnits[1]) / 2.0; + double tp_with_margin; unsigned int unit = 0; do { - tick_period_ = order_decimal * ScaleUnits[unit++]; - } while (tick_period_ < min_period && - unit < countof(ScaleUnits)); + tp_with_margin = order_decimal.convert_to() * + (ScaleUnits[unit++] + tp_margin); + } while (tp_with_margin < min_period && unit < countof(ScaleUnits)); + + tick_period = order_decimal * ScaleUnits[unit - 1]; + tick_prefix = static_cast( + (order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3); + + // 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_prefix_ = (order - pv::util::FirstSIPrefixPower) / 3; + tick_period_width = (tick_period / scale_).convert_to(); - typical_width = m.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, - format_time(offset_, tick_prefix_)).width() + + const QString label_text = Ruler::format_time_with_distance( + tick_period, max_time, tick_prefix, time_unit_, tick_precision); + + label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX, + Qt::AlignLeft | Qt::AlignTop, label_text).width() + MinValueSpacing; min_width += SpacingIncrement; + } while (tick_period_width < label_width); - } while(typical_width > tick_period_ / scale_); + set_tick_period(tick_period); + set_tick_prefix(tick_prefix); + set_tick_precision(tick_precision); } void View::update_scroll() @@ -469,11 +617,12 @@ void View::update_scroll() const QSize areaSize = viewport_->size(); // Set the horizontal scroll bar - double length = 0, offset = 0; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); - int major_tick_distance = tick_period_ / scale_; + int major_tick_distance = (tick_period_ / scale_).convert_to(); horizontalScrollBar()->setPageStep(areaSize.width() / 2); horizontalScrollBar()->setSingleStep(major_tick_distance); @@ -482,11 +631,11 @@ void View::update_scroll() if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); - horizontalScrollBar()->setSliderPosition(offset); + horizontalScrollBar()->setSliderPosition(offset.convert_to()); } else { horizontalScrollBar()->setRange(0, MaxScrollValue); horizontalScrollBar()->setSliderPosition( - offset_ * MaxScrollValue / (scale_ * length)); + (offset_ * MaxScrollValue / (scale_ * length)).convert_to()); } updating_scroll_ = false; @@ -525,43 +674,89 @@ QRectF View::label_rect(const QRectF &rect) return QRectF(); } -bool View::add_channels_to_owner( +TraceTreeItemOwner* View::find_prevalent_trace_group( + const shared_ptr &group, + const unordered_map, shared_ptr > + &signal_map) +{ + assert(group); + + unordered_set owners; + vector owner_list; + + // Make a set and a list of all the owners + for (const auto &channel : group->channels()) { + const auto iter = signal_map.find(channel); + if (iter == signal_map.end()) + continue; + + TraceTreeItemOwner *const o = (*iter).second->owner(); + owner_list.push_back(o); + owners.insert(o); + } + + // Iterate through the list of owners, and find the most prevalent + size_t max_prevalence = 0; + TraceTreeItemOwner *prevalent_owner = nullptr; + for (TraceTreeItemOwner *owner : owners) { + const size_t prevalence = std::count_if( + owner_list.begin(), owner_list.end(), + [&](TraceTreeItemOwner *o) { return o == owner; }); + if (prevalence > max_prevalence) { + max_prevalence = prevalence; + prevalent_owner = owner; + } + } + + return prevalent_owner; +} + +vector< shared_ptr > View::extract_new_traces_for_channels( const vector< shared_ptr > &channels, - RowItemOwner *owner, int &offset, - unordered_map, shared_ptr > + const unordered_map, shared_ptr > &signal_map, - std::function)> filter_func) + set< shared_ptr > &add_list) { - bool any_added = false; - - assert(owner); + vector< shared_ptr > filtered_traces; for (const auto &channel : channels) { - const auto iter = signal_map.find(channel); - if (iter == signal_map.end() || - (filter_func && !filter_func((*iter).second))) + const auto map_iter = signal_map.find(channel); + if (map_iter == signal_map.end()) continue; - shared_ptr row_item = (*iter).second; - owner->add_child_item(row_item); - apply_offset(row_item, offset); - signal_map.erase(iter); + shared_ptr trace = (*map_iter).second; + const auto list_iter = add_list.find(trace); + if (list_iter == add_list.end()) + continue; - any_added = true; + filtered_traces.push_back(trace); + add_list.erase(list_iter); } - return any_added; + return filtered_traces; } -void View::apply_offset(shared_ptr row_item, int &offset) { - assert(row_item); - const pair extents = row_item->v_extents(); - if (row_item->enabled()) - offset += -extents.first; - row_item->force_to_v_offset(offset); - if (row_item->enabled()) - offset += extents.second; +void View::determine_time_unit() +{ + // Check whether we know the sample rate and hence can use time as the unit + if (time_unit_ == util::TimeUnit::Samples) { + shared_lock lock(session().signals_mutex()); + const unordered_set< shared_ptr > &sigs(session().signals()); + + // Check all signals but... + for (const shared_ptr signal : sigs) { + const shared_ptr data = signal->data(); + + // ...only check first segment of each + const vector< shared_ptr > segments = data->segments(); + if (!segments.empty()) + if (segments[0]->samplerate()) { + set_time_unit(util::TimeUnit::Time); + break; + } + } + } } bool View::eventFilter(QObject *object, QEvent *event) @@ -632,8 +827,8 @@ void View::time_item_appearance_changed(bool label, bool content) void View::extents_changed(bool horz, bool vert) { sticky_events_ |= - (horz ? RowItemHExtentsChanged : 0) | - (vert ? RowItemVExtentsChanged : 0); + (horz ? TraceTreeItemHExtentsChanged : 0) | + (vert ? TraceTreeItemVExtentsChanged : 0); lazy_event_handler_.start(); } @@ -642,13 +837,21 @@ void View::h_scroll_value_changed(int value) if (updating_scroll_) return; + // Disable sticky scrolling when user moves the horizontal scroll bar + // during a running acquisition + if (sticky_scrolling_ && (session_.get_capture_state() == Session::Running)) { + sticky_scrolling_ = false; + sticky_scrolling_changed(false); + } + const int range = horizontalScrollBar()->maximum(); if (range < MaxScrollValue) - offset_ = scale_ * value; + set_offset(scale_ * value); else { - double length = 0, offset; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); - offset_ = scale_ * length * value / MaxScrollValue; + set_offset(scale_ * length * value / MaxScrollValue); } ruler_->update(); @@ -663,89 +866,192 @@ void View::v_scroll_value_changed() void View::signals_changed() { - int offset = 0; + vector< shared_ptr > new_top_level_items; - // Populate the traces - clear_child_items(); + const auto device = session_.device(); + if (!device) + return; - shared_ptr device = session_.device(); - assert(device); + shared_ptr sr_dev = device->device(); + assert(sr_dev); - // Collect a set of signals - unordered_map, shared_ptr > - signal_map; + // Make a list of traces that are being added, and a list of traces + // that are being removed + const vector> prev_trace_list = list_by_type(); + const set> prev_traces( + prev_trace_list.begin(), prev_trace_list.end()); shared_lock lock(session_.signals_mutex()); - const vector< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > &sigs(session_.signals()); + + set< shared_ptr > traces(sigs.begin(), sigs.end()); + +#ifdef ENABLE_DECODE + const vector< shared_ptr > decode_traces( + session().get_decode_signals()); + traces.insert(decode_traces.begin(), decode_traces.end()); +#endif + set< shared_ptr > add_traces; + set_difference(traces.begin(), traces.end(), + prev_traces.begin(), prev_traces.end(), + inserter(add_traces, add_traces.begin())); + + set< shared_ptr > remove_traces; + set_difference(prev_traces.begin(), prev_traces.end(), + traces.begin(), traces.end(), + inserter(remove_traces, remove_traces.begin())); + + // Make a look-up table of sigrok Channels to pulseview Signals + unordered_map, shared_ptr > + signal_map; for (const shared_ptr &sig : sigs) signal_map[sig->channel()] = sig; // Populate channel groups - for (auto entry : device->channel_groups()) + for (auto entry : sr_dev->channel_groups()) { const shared_ptr &group = entry.second; if (group->channels().size() <= 1) continue; - shared_ptr trace_group(new TraceGroup()); - int child_offset = 0; - if (add_channels_to_owner(group->channels(), - trace_group.get(), child_offset, signal_map)) - { - add_child_item(trace_group); - apply_offset(trace_group, offset); - } - } + // Find best trace group to add to + TraceTreeItemOwner *owner = find_prevalent_trace_group( + group, signal_map); - // Add the remaining logic channels - shared_ptr logic_trace_group(new TraceGroup()); - int child_offset = 0; + // If there is no trace group, create one + shared_ptr new_trace_group; + if (!owner) { + new_trace_group.reset(new TraceGroup()); + owner = new_trace_group.get(); + } - if (add_channels_to_owner(device->channels(), - logic_trace_group.get(), child_offset, signal_map, - [](shared_ptr r) -> bool { - return dynamic_pointer_cast(r) != nullptr; - })) + // Extract traces for the trace group, removing them from + // the add list + const vector< shared_ptr > new_traces_in_group = + extract_new_traces_for_channels(group->channels(), + signal_map, add_traces); + + // Add the traces to the group + const pair prev_v_extents = owner->v_extents(); + int offset = prev_v_extents.second - prev_v_extents.first; + for (shared_ptr trace : new_traces_in_group) { + assert(trace); + owner->add_child_item(trace); + + const pair extents = trace->v_extents(); + if (trace->enabled()) + offset += -extents.first; + trace->force_to_v_offset(offset); + if (trace->enabled()) + offset += extents.second; + } - { - add_child_item(logic_trace_group); - apply_offset(logic_trace_group, offset); + // If this is a new group, enqueue it in the new top level + // items list + if (!new_traces_in_group.empty() && new_trace_group) + new_top_level_items.push_back(new_trace_group); } - // Add the remaining channels - add_channels_to_owner(device->channels(), this, offset, signal_map); - assert(signal_map.empty()); + // Enqueue the remaining channels as free ungrouped traces + const vector< shared_ptr > new_top_level_signals = + extract_new_traces_for_channels(sr_dev->channels(), + signal_map, add_traces); + new_top_level_items.insert(new_top_level_items.end(), + new_top_level_signals.begin(), new_top_level_signals.end()); + + // Enqueue any remaining traces i.e. decode traces + new_top_level_items.insert(new_top_level_items.end(), + add_traces.begin(), add_traces.end()); + + // Remove any removed traces + for (shared_ptr trace : remove_traces) { + TraceTreeItemOwner *const owner = trace->owner(); + assert(owner); + owner->remove_child_item(trace); + } - // Add decode signals -#ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( - session().get_decode_signals()); - for (auto s : decode_sigs) { - add_child_item(s); - apply_offset(s, offset); + // Add and position the pending top levels items + for (auto item : new_top_level_items) { + add_child_item(item); + + // Position the item after the last present item + int offset = v_extents().second; + const pair extents = item->v_extents(); + if (item->enabled()) + offset += -extents.first; + item->force_to_v_offset(offset); + if (item->enabled()) + offset += extents.second; } -#endif update_layout(); + + header_->update(); + viewport_->update(); +} + +void View::capture_state_updated(int state) +{ + if (state == Session::Running) + set_time_unit(util::TimeUnit::Samples); + + if (state == Session::Stopped) { + // After acquisition has stopped we need to re-calculate the ticks once + // as it's otherwise done when the user pans or zooms, which is too late + calculate_tick_spacing(); + + // Reset "always zoom to fit", the acquisition has stopped + if (always_zoom_to_fit_) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } + } } void View::data_updated() { - // Update the scroll bars - update_scroll(); + if (always_zoom_to_fit_ || sticky_scrolling_) { + if (!delayed_view_updater_.isActive()) + delayed_view_updater_.start(); + } else { + determine_time_unit(); + update_scroll(); + ruler_->update(); + viewport_->update(); + } +} + +void View::perform_delayed_view_update() +{ + if (always_zoom_to_fit_) + zoom_fit(true); - // Repaint the view + if (sticky_scrolling_) { + // Make right side of the view sticky + double length = 0; + Timestamp offset; + get_scroll_layout(length, offset); + + const QSize areaSize = viewport_->size(); + length = max(length - areaSize.width(), 0.0); + + set_offset(scale_ * length); + } + + determine_time_unit(); + update_scroll(); + ruler_->update(); viewport_->update(); } void View::process_sticky_events() { - if (sticky_events_ & RowItemHExtentsChanged) + if (sticky_events_ & TraceTreeItemHExtentsChanged) update_layout(); - if (sticky_events_ & RowItemVExtentsChanged) { - restack_all_row_items(); + if (sticky_events_ & TraceTreeItemVExtentsChanged) { + restack_all_trace_tree_items(); update_scroll(); } @@ -755,7 +1061,7 @@ void View::process_sticky_events() void View::on_hover_point_changed() { - for (shared_ptr r : *this) + for (shared_ptr r : *this) r->hover_point_changed(); }