X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=fdb9354b9315cefe4c4a06d23b00a879db7bab82;hp=80ade0d23f5bccd573bb5385d064a1d40d9aec04;hb=818f617924d2ed393cadd362fdafbd9d4288848f;hpb=4f82e4f613aced3594f07fa219a9d8c247eaed11 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 80ade0d2..fdb9354b 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,32 +22,50 @@ #include #endif +#include + +#include #include #include #include +#include #include +#include +#include #include +#include #include #include -#include "cursorheader.h" -#include "decodetrace.h" -#include "header.h" -#include "ruler.h" -#include "signal.h" -#include "view.h" -#include "viewport.h" +#include + +#include "decodetrace.hpp" +#include "header.hpp" +#include "logicsignal.hpp" +#include "ruler.hpp" +#include "signal.hpp" +#include "tracegroup.hpp" +#include "view.hpp" +#include "viewport.hpp" -#include "pv/sigsession.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" +#include "pv/session.hpp" +#include "pv/devices/device.hpp" +#include "pv/data/logic.hpp" +#include "pv/data/logicsegment.hpp" +#include "pv/util.hpp" using boost::shared_lock; using boost::shared_mutex; + using pv::data::SignalData; -using std::back_inserter; +using pv::data::Segment; +using pv::util::format_time; +using pv::util::TimeUnit; + using std::deque; +using std::dynamic_pointer_cast; +using std::inserter; using std::list; using std::lock_guard; using std::max; @@ -55,7 +73,10 @@ 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; using std::vector; using std::weak_ptr; @@ -63,90 +84,95 @@ namespace pv { namespace view { const double View::MaxScale = 1e9; -const double View::MinScale = 1e-15; +const double 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 QColor View::CursorAreaColour(220, 231, 243); - -const QSizeF View::LabelPadding(4, 0); +const int View::ScaleUnits[3] = {1, 2, 5}; -View::View(SigSession &session, QWidget *parent) : +View::View(Session &session, QWidget *parent) : QAbstractScrollArea(parent), - _session(session), - _viewport(new Viewport(*this)), - _ruler(new Ruler(*this)), - _cursorheader(new CursorHeader(*this)), - _header(new Header(*this)), - _scale(1e-6), - _offset(0), - _v_offset(0), - _updating_scroll(false), - _show_cursors(false), - _cursors(*this), - _hover_point(-1, -1) + session_(session), + viewport_(new Viewport(*this)), + ruler_(new Ruler(*this)), + header_(new Header(*this)), + scale_(1e-3), + offset_(0), + updating_scroll_(false), + sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui() + always_zoom_to_fit_(false), + tick_period_(0.0), + tick_prefix_(0), + tick_precision_(0), + time_unit_(util::Time), + show_cursors_(false), + cursors_(new CursorPair(*this)), + next_flag_text_('A'), + hover_point_(-1, -1) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(v_scroll_value_changed(int))); + this, SLOT(v_scroll_value_changed())); - connect(&_session, SIGNAL(signals_changed()), + connect(&session_, SIGNAL(signals_changed()), this, SLOT(signals_changed())); - connect(&_session, SIGNAL(capture_state_changed(int)), + connect(&session_, SIGNAL(capture_state_changed(int)), + this, SLOT(capture_state_updated(int))); + connect(&session_, SIGNAL(data_received()), this, SLOT(data_updated())); - connect(&_session, SIGNAL(data_received()), + connect(&session_, SIGNAL(frame_ended()), this, SLOT(data_updated())); - connect(&_session, SIGNAL(frame_ended()), - this, SLOT(data_updated())); - - connect(_cursors.first().get(), SIGNAL(time_changed()), - this, SLOT(marker_time_changed())); - connect(_cursors.second().get(), SIGNAL(time_changed()), - this, SLOT(marker_time_changed())); - - connect(_header, SIGNAL(geometry_updated()), - this, SLOT(on_geometry_updated())); - connect(_header, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); - connect(_header, SIGNAL(selection_changed()), - _cursorheader, SLOT(clear_selection())); - connect(_cursorheader, SIGNAL(selection_changed()), - _header, SLOT(clear_selection())); + connect(header_, SIGNAL(selection_changed()), + ruler_, SLOT(clear_selection())); + connect(ruler_, SIGNAL(selection_changed()), + header_, SLOT(clear_selection())); - connect(_header, SIGNAL(selection_changed()), + connect(header_, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); - connect(_cursorheader, SIGNAL(selection_changed()), + connect(ruler_, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); connect(this, SIGNAL(hover_point_changed()), this, SLOT(on_hover_point_changed())); - setViewport(_viewport); + connect(&lazy_event_handler_, SIGNAL(timeout()), + 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); - _ruler->installEventFilter(this); - _cursorheader->installEventFilter(this); - _header->installEventFilter(this); + viewport_->installEventFilter(this); + ruler_->installEventFilter(this); + header_->installEventFilter(this); // Trigger the initial event manually. The default device has signals // which were created before this object came into being signals_changed(); // make sure the transparent widgets are on the top - _cursorheader->raise(); - _header->raise(); + ruler_->raise(); + header_->raise(); + + // Update the zoom state + calculate_tick_spacing(); } -SigSession& View::session() +Session& View::session() { - return _session; + return session_; } -const SigSession& View::session() const +const Session& View::session() const { - return _session; + return session_; } View* View::view() @@ -161,48 +187,99 @@ const View* View::view() const Viewport* View::viewport() { - return _viewport; + return viewport_; } const Viewport* View::viewport() const { - return _viewport; + return viewport_; +} + +vector< shared_ptr > View::time_items() const +{ + const vector> f(flags()); + vector> items(f.begin(), f.end()); + items.push_back(cursors_); + items.push_back(cursors_->first()); + items.push_back(cursors_->second()); + return items; } double View::scale() const { - return _scale; + return scale_; } double View::offset() const { - return _offset; + return offset_; +} + +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 +{ + return tick_prefix_; +} + +unsigned int View::tick_precision() const +{ + return tick_precision_; } -int View::owner_v_offset() const +double View::tick_period() const { - return -_v_offset; + return tick_period_; +} + +TimeUnit View::time_unit() const +{ + return time_unit_; } void View::zoom(double steps) { - zoom(steps, _viewport->width() / 2); + zoom(steps, viewport_->width() / 2); } void View::zoom(double steps, int offset) { - set_zoom(_scale * pow(3.0/2.0, -steps), offset); + set_zoom(scale_ * pow(3.0/2.0, -steps), offset); } -void View::zoom_fit() +void View::zoom_fit(bool gui_state) { + // 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 double delta = extents.second - extents.first; if (delta < 1e-12) return; - assert(_viewport); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); if (w <= 0) return; @@ -222,14 +299,17 @@ void View::zoom_one_to_one() double samplerate = 0.0; for (const shared_ptr d : visible_data) { assert(d); - samplerate = max(samplerate, d->samplerate()); + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) + samplerate = max(samplerate, s->samplerate()); } if (samplerate == 0.0) return; - assert(_viewport); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); if (w <= 0) return; @@ -238,20 +318,37 @@ void View::zoom_one_to_one() void View::set_scale_offset(double scale, double 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); + } + } + + scale_ = scale; + offset_ = offset; + + calculate_tick_spacing(); update_scroll(); - _ruler->update(); - _cursorheader->update(); - _viewport->update(); + 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; @@ -264,97 +361,207 @@ set< shared_ptr > View::get_visible_data() const pair View::get_time_extents() const { - const set< shared_ptr > visible_data = get_visible_data(); - if (visible_data.empty()) - return make_pair(0.0, 0.0); - double left_time = DBL_MAX, right_time = DBL_MIN; + const set< shared_ptr > visible_data = get_visible_data(); for (const shared_ptr d : visible_data) { - const double start_time = d->get_start_time(); - double samplerate = d->samplerate(); - samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; - - left_time = min(left_time, start_time); - right_time = max(right_time, start_time + - d->get_max_sample_count() / samplerate); + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) { + 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->max_sample_count() / samplerate); + } } + if (left_time == DBL_MAX && right_time == DBL_MIN) + return make_pair(0.0, 0.0); + 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 { - return _show_cursors; + return show_cursors_; } void View::show_cursors(bool show) { - _show_cursors = show; - _cursorheader->update(); - _viewport->update(); + show_cursors_ = show; + ruler_->update(); + viewport_->update(); } void View::centre_cursors() { - const double time_width = _scale * _viewport->width(); - _cursors.first()->set_time(_offset + time_width * 0.4); - _cursors.second()->set_time(_offset + time_width * 0.6); - _cursorheader->update(); - _viewport->update(); + const double time_width = scale_ * viewport_->width(); + cursors_->first()->set_time(offset_ + time_width * 0.4); + cursors_->second()->set_time(offset_ + time_width * 0.6); + ruler_->update(); + viewport_->update(); } -CursorPair& View::cursors() +std::shared_ptr View::cursors() const { - return _cursors; + return cursors_; } -const CursorPair& View::cursors() const +void View::add_flag(double time) { - return _cursors; + flags_.push_back(shared_ptr(new Flag(*this, time, + QString("%1").arg(next_flag_text_)))); + next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' : + (next_flag_text_ + 1); + time_item_appearance_changed(true, true); +} + +void View::remove_flag(std::shared_ptr flag) +{ + flags_.remove(flag); + time_item_appearance_changed(true, true); +} + +vector< std::shared_ptr > View::flags() const +{ + vector< std::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(); + }); + + return flags; } const QPoint& View::hover_point() const { - return _hover_point; + return hover_point_; } void View::update_viewport() { - assert(_viewport); - _viewport->update(); + assert(viewport_); + viewport_->update(); + header_->update(); +} + +void View::restack_all_row_items() +{ + // Make a list of owners that is sorted from deepest first + const auto owners = list_row_item_owners(); + vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); + sort(sorted_owners.begin(), sorted_owners.end(), + [](const RowItemOwner* a, const RowItemOwner *b) { + return a->depth() > b->depth(); }); + + // Restack the items recursively + for (auto &o : sorted_owners) + o->restack_items(); + + // Animate the items to their destination + for (const auto &r : *this) + r->animate_to_layout_v_offset(); } void View::get_scroll_layout(double &length, double &offset) const { const pair extents = get_time_extents(); - length = (extents.second - extents.first) / _scale; - offset = _offset / _scale; + length = (extents.second - extents.first) / scale_; + offset = offset_ / scale_; } void View::set_zoom(double scale, int offset) { - const double cursor_offset = _offset + _scale * 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 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); } +void View::calculate_tick_spacing() +{ + const double SpacingIncrement = 10.0f; + const double MinValueSpacing = 25.0f; + + // Figure out the highest numeric value visible on a label + const QSize areaSize = viewport_->size(); + const double max_time = max(fabs(offset_), + fabs(offset_ + scale_ * areaSize.width())); + + double min_width = SpacingIncrement; + double label_width, tick_period_width; + + QFontMetrics m(QApplication::font()); + + do { + const double min_period = scale_ * min_width; + + const int order = (int)floorf(log10f(min_period)); + const double order_decimal = pow(10.0, 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 { + tp_with_margin = order_decimal * (ScaleUnits[unit++] + tp_margin); + } while (tp_with_margin < min_period && unit < countof(ScaleUnits)); + + tick_period_ = order_decimal * ScaleUnits[unit - 1]; + tick_prefix_ = (order - pv::util::FirstSIPrefixPower) / 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((int)ceil(log10f(1 / tick_period_)), 0); + + tick_period_width = tick_period_ / scale_; + + const QString label_text = + format_time(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); +} + void View::update_scroll() { - assert(_viewport); + assert(viewport_); - const QSize areaSize = _viewport->size(); + const QSize areaSize = viewport_->size(); // Set the horizontal scroll bar double length = 0, offset = 0; get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); + int major_tick_distance = tick_period_ / scale_; + horizontalScrollBar()->setPageStep(areaSize.width() / 2); + horizontalScrollBar()->setSingleStep(major_tick_distance); - _updating_scroll = true; + updating_scroll_ = true; if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); @@ -362,68 +569,149 @@ void View::update_scroll() } else { horizontalScrollBar()->setRange(0, MaxScrollValue); horizontalScrollBar()->setSliderPosition( - _offset * MaxScrollValue / (_scale * length)); + offset_ * MaxScrollValue / (scale_ * length)); } - _updating_scroll = false; + updating_scroll_ = false; // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); + verticalScrollBar()->setSingleStep(areaSize.height() / 8); const pair extents = v_extents(); - const int extra_scroll_height = (extents.second - extents.first) / 4; - verticalScrollBar()->setRange(extents.first - extra_scroll_height, - extents.first + extra_scroll_height); + verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2), + extents.second - (areaSize.height() / 2)); } void View::update_layout() { setViewportMargins( - _header->sizeHint().width() - pv::view::Header::BaselineOffset, - _ruler->sizeHint().height(), 0, 0); - _ruler->setGeometry(_viewport->x(), 0, - _viewport->width(), _viewport->y()); - _cursorheader->setGeometry( - _viewport->x(), - _ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2, - _viewport->width(), _cursorheader->sizeHint().height()); - _header->setGeometry(0, _viewport->y(), - _header->sizeHint().width(), _viewport->height()); + header_->sizeHint().width() - pv::view::Header::BaselineOffset, + ruler_->sizeHint().height(), 0, 0); + ruler_->setGeometry(viewport_->x(), 0, + viewport_->width(), ruler_->extended_size_hint().height()); + header_->setGeometry(0, viewport_->y(), + header_->extended_size_hint().width(), viewport_->height()); update_scroll(); } -void View::paint_label(QPainter &p, int right, bool hover) +void View::paint_label(QPainter &p, const QRect &rect, bool hover) { (void)p; - (void)right; + (void)rect; (void)hover; } -QRectF View::label_rect(int right) +QRectF View::label_rect(const QRectF &rect) { - (void)right; + (void)rect; return QRectF(); } +RowItemOwner* 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; + + RowItemOwner *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; + RowItemOwner *prevalent_owner = nullptr; + for (RowItemOwner *owner : owners) { + const size_t prevalence = std::count_if( + owner_list.begin(), owner_list.end(), + [&](RowItemOwner *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, + const unordered_map, shared_ptr > + &signal_map, + set< shared_ptr > &add_list) +{ + vector< shared_ptr > filtered_traces; + + for (const auto &channel : channels) + { + const auto map_iter = signal_map.find(channel); + if (map_iter == signal_map.end()) + continue; + + shared_ptr trace = (*map_iter).second; + const auto list_iter = add_list.find(trace); + if (list_iter == add_list.end()) + continue; + + filtered_traces.push_back(trace); + add_list.erase(list_iter); + } + + return filtered_traces; +} + +void View::determine_time_unit() +{ + // Check whether we know the sample rate and hence can use time as the unit + if (time_unit_ == util::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()) { + time_unit_ = util::Time; + break; + } + } + } +} + bool View::eventFilter(QObject *object, QEvent *event) { const QEvent::Type type = event->type(); if (type == QEvent::MouseMove) { const QMouseEvent *const mouse_event = (QMouseEvent*)event; - if (object == _viewport) - _hover_point = mouse_event->pos(); - else if (object == _ruler || object == _cursorheader) - _hover_point = QPoint(mouse_event->x(), 0); - else if (object == _header) - _hover_point = QPoint(0, mouse_event->y()); + if (object == viewport_) + hover_point_ = mouse_event->pos(); + else if (object == ruler_) + hover_point_ = QPoint(mouse_event->x(), 0); + else if (object == header_) + hover_point_ = QPoint(0, mouse_event->y()); else - _hover_point = QPoint(-1, -1); + hover_point_ = QPoint(-1, -1); hover_point_changed(); } else if (type == QEvent::Leave) { - _hover_point = QPoint(-1, -1); + hover_point_ = QPoint(-1, -1); hover_point_changed(); } @@ -454,91 +742,245 @@ void View::resizeEvent(QResizeEvent*) update_layout(); } +void View::row_item_appearance_changed(bool label, bool content) +{ + if (label) + header_->update(); + if (content) + viewport_->update(); +} + +void View::time_item_appearance_changed(bool label, bool content) +{ + if (label) + ruler_->update(); + if (content) + viewport_->update(); +} + +void View::extents_changed(bool horz, bool vert) +{ + sticky_events_ |= + (horz ? RowItemHExtentsChanged : 0) | + (vert ? RowItemVExtentsChanged : 0); + lazy_event_handler_.start(); +} + void View::h_scroll_value_changed(int value) { - if (_updating_scroll) + 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; + offset_ = scale_ * value; else { double length = 0, offset; get_scroll_layout(length, offset); - _offset = _scale * length * value / MaxScrollValue; + offset_ = scale_ * length * value / MaxScrollValue; } - _ruler->update(); - _cursorheader->update(); - _viewport->update(); + ruler_->update(); + viewport_->update(); } -void View::v_scroll_value_changed(int value) +void View::v_scroll_value_changed() { - _v_offset = value; - _header->update(); - _viewport->update(); + header_->update(); + viewport_->update(); } void View::signals_changed() { - // Populate the traces - clear_child_items(); + vector< shared_ptr > new_top_level_items; - shared_lock lock(session().signals_mutex()); - const vector< shared_ptr > &sigs(session().signals()); - for (auto s : sigs) - add_child_item(s); + const auto device = session_.device(); + if (!device) + return; + + shared_ptr sr_dev = device->device(); + assert(sr_dev); + + // Make a list of traces that are being added, and a list of traces + // that are being removed + const set> prev_traces = list_by_type(); + + shared_lock lock(session_.signals_mutex()); + const unordered_set< shared_ptr > &sigs(session_.signals()); + + set< shared_ptr > traces(sigs.begin(), sigs.end()); #ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( + const vector< shared_ptr > decode_traces( session().get_decode_signals()); - for (auto s : decode_sigs) - add_child_item(s); + traces.insert(decode_traces.begin(), decode_traces.end()); #endif - // Create the initial layout - int offset = 0; - for (shared_ptr r : *this) { - const pair extents = r->v_extents(); - if (r->enabled()) + 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 : sr_dev->channel_groups()) + { + const shared_ptr &group = entry.second; + + if (group->channels().size() <= 1) + continue; + + // Find best trace group to add to + RowItemOwner *owner = find_prevalent_trace_group( + group, signal_map); + + // 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(); + } + + // 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; + } + + // 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); + } + + // 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) { + RowItemOwner *const owner = trace->owner(); + assert(owner); + owner->remove_child_item(trace); + } + + // 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; - r->set_v_offset(offset); - if (r->enabled()) + item->force_to_v_offset(offset); + if (item->enabled()) offset += extents.second; } update_layout(); - // Update the child widgets - _header->signals_updated(); - _viewport->signals_updated(); + header_->update(); + viewport_->update(); } -void View::data_updated() +void View::capture_state_updated(int state) { - // Update the scroll bars - update_scroll(); + // Reset "always zoom to fit" when we change to the stopped state + if (always_zoom_to_fit_ && (state == Session::Stopped)) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } - // Repaint the view - _viewport->update(); + if (state == Session::Running) + time_unit_ = util::Samples; } -void View::marker_time_changed() +void View::data_updated() { - _cursorheader->update(); - _viewport->update(); + 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::on_signals_moved() +void View::perform_delayed_view_update() { + if (always_zoom_to_fit_) + zoom_fit(true); + + if (sticky_scrolling_) { + // Make right side of the view sticky + double length = 0, offset; + get_scroll_layout(length, offset); + + const QSize areaSize = viewport_->size(); + length = max(length - areaSize.width(), 0.0); + + offset_ = scale_ * length; + } + + determine_time_unit(); update_scroll(); - signals_moved(); + ruler_->update(); + viewport_->update(); } -void View::on_geometry_updated() +void View::process_sticky_events() { - update_layout(); + if (sticky_events_ & RowItemHExtentsChanged) + update_layout(); + if (sticky_events_ & RowItemVExtentsChanged) { + restack_all_row_items(); + update_scroll(); + } + + // Clear the sticky events + sticky_events_ = 0; } void View::on_hover_point_changed()