X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=8e48ae444582ffd96b9f3d5af407dcd28b3abe17;hp=37c3b14a1380f45994648099944625b8f4295c21;hb=d6128866e740f496a1bb3c9636e188648507fc3a;hpb=a5d93c27b5bd6b95000e29c6cddac56ab254b289 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 37c3b14a..8e48ae44 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,131 +22,168 @@ #include #endif +#include + +#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 "analogsignal.hpp" +#include "header.hpp" +#include "logicsignal.hpp" +#include "ruler.hpp" +#include "signal.hpp" +#include "tracegroup.hpp" +#include "triggermarker.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" + +#ifdef ENABLE_DECODE +#include "decodetrace.hpp" +#endif using boost::shared_lock; using boost::shared_mutex; + using pv::data::SignalData; +using pv::data::Segment; +using pv::util::TimeUnit; +using pv::util::Timestamp; + using std::back_inserter; +using std::copy_if; using std::deque; +using std::dynamic_pointer_cast; +using std::inserter; using std::list; using std::lock_guard; using std::max; using std::make_pair; +using std::make_shared; 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; 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 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), + 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'), + trigger_markers_(), + 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); - _viewport->installEventFilter(this); - _ruler->installEventFilter(this); - _cursorheader->installEventFilter(this); - _header->installEventFilter(this); + 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); + 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,53 +198,156 @@ 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()); + + for (auto trigger_marker : trigger_markers_) + items.push_back(trigger_marker); + + return items; } double View::scale() const { - return _scale; + return scale_; +} + +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; +} + +pv::util::SIPrefix View::tick_prefix() const +{ + return tick_prefix_; +} + +void View::set_tick_prefix(pv::util::SIPrefix tick_prefix) +{ + if (tick_prefix_ != tick_prefix) { + tick_prefix_ = tick_prefix; + Q_EMIT tick_prefix_changed(); + } } -double View::offset() const +unsigned int View::tick_precision() const { - return _offset; + return tick_precision_; } -int View::owner_v_offset() const +void View::set_tick_precision(unsigned tick_precision) { - return -_v_offset; + 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); + 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) { - 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); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); 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() @@ -219,39 +359,45 @@ void View::zoom_one_to_one() if (visible_data.empty()) return; - double samplerate = 0.0; - for (const shared_ptr d : visible_data) { - assert(d); - samplerate = max(samplerate, d->samplerate()); - } - - if (samplerate == 0.0) - return; - - assert(_viewport); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); if (w <= 0) return; - set_zoom(1.0 / samplerate, w / 2); + set_zoom(1.0 / session_.get_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(); - _cursorheader->update(); - _viewport->update(); - scale_offset_changed(); + ruler_->update(); + viewport_->update(); } 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; @@ -262,191 +408,427 @@ set< shared_ptr > View::get_visible_data() const return visible_data; } -pair View::get_time_extents() const +pair View::get_time_extents() const { + boost::optional left_time, right_time; 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; - 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); + for (const shared_ptr d : visible_data) { + 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 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; + } } - assert(left_time < right_time); - return make_pair(left_time, right_time); + if (!left_time || !right_time) + return make_pair(0, 0); + + assert(*left_time < *right_time); + return make_pair(*left_time, *right_time); +} + +void View::enable_sticky_scrolling(bool state) +{ + sticky_scrolling_ = state; +} + +void View::enable_coloured_bg(bool state) +{ + const vector> items( + list_by_type()); + + for (shared_ptr i : items) { + // Can't cast to Trace because it's abstract, so we need to + // check for any derived classes individually + + shared_ptr a = dynamic_pointer_cast(i); + if (a) + a->set_coloured_bg(state); + + shared_ptr l = dynamic_pointer_cast(i); + if (l) + l->set_coloured_bg(state); + +#ifdef ENABLE_DECODE + shared_ptr d = dynamic_pointer_cast(i); + if (d) + d->set_coloured_bg(state); +#endif + } + + viewport_->update(); } 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(const Timestamp& 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); } -const QPoint& View::hover_point() const +void View::remove_flag(std::shared_ptr flag) { - return _hover_point; + flags_.remove(flag); + time_item_appearance_changed(true, true); } -void View::normalize_layout() +vector< std::shared_ptr > View::flags() const { - int v_min = INT_MAX; - for (const shared_ptr r : *this) - v_min = min(r->v_offset(), v_min); + 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(); + }); - const int delta = -min(v_min, 0); - for (shared_ptr r : *this) - r->set_v_offset(r->v_offset() + delta); + return flags; +} - verticalScrollBar()->setSliderPosition(_v_offset + delta); - v_scroll_value_changed(verticalScrollBar()->sliderPosition()); +const QPoint& View::hover_point() const +{ + return hover_point_; } void View::update_viewport() { - assert(_viewport); - _viewport->update(); + assert(viewport_); + viewport_->update(); + header_->update(); +} + +void View::restack_all_trace_tree_items() +{ + // Make a list of owners that is sorted from deepest first + const vector> items( + list_by_type()); + set< TraceTreeItemOwner* > owners; + for (const auto &r : items) + owners.insert(r->owner()); + vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end()); + sort(sorted_owners.begin(), sorted_owners.end(), + [](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) { + return a->depth() > b->depth(); }); + + // Restack the items recursively + for (auto &o : sorted_owners) + o->restack_items(); + + // Re-assign background colors + bool next_bgcolour_state = 0; + + for (auto &o : sorted_owners) + next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state); + + // Animate the items to their destination + for (const auto &i : items) + i->animate_to_layout_v_offset(); +} + +void View::trigger_event(util::Timestamp location) +{ + trigger_markers_.push_back(shared_ptr( + new TriggerMarker(*this, location))); } -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; - offset = _offset / _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 = 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; + 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 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 { + 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_period_width = (tick_period / scale_).convert_to(); + + 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); + + set_tick_period(tick_period); + set_tick_prefix(tick_prefix); + set_tick_precision(tick_precision); } 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; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); + int major_tick_distance = (tick_period_ / scale_).convert_to(); + horizontalScrollBar()->setPageStep(areaSize.width() / 2); + horizontalScrollBar()->setSingleStep(major_tick_distance); - _updating_scroll = true; + updating_scroll_ = true; 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; + 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(); } +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, + 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::TimeUnit::Samples) { + 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) { 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(); } return QObject::eventFilter(object, event); } -bool View::viewportEvent(QEvent *e) +bool View::viewportEvent(QEvent *event) { - switch(e->type()) { + switch (event->type()) { case QEvent::Paint: case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: @@ -457,9 +839,8 @@ bool View::viewportEvent(QEvent *e) case QEvent::TouchUpdate: case QEvent::TouchEnd: return false; - default: - return QAbstractScrollArea::viewportEvent(e); + return QAbstractScrollArea::viewportEvent(event); } } @@ -468,97 +849,286 @@ 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 ? TraceTreeItemHExtentsChanged : 0) | + (vert ? TraceTreeItemVExtentsChanged : 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; + 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(); - _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(); + using sigrok::Channel; - shared_lock lock(session().signals_mutex()); - const vector< shared_ptr > &sigs(session().signals()); - for (auto s : sigs) - add_child_item(s); + vector< shared_ptr > new_top_level_items; + + if (!session_.device()) + return; + + shared_ptr sr_dev = session_.device()->device(); + assert(sr_dev); + const vector< shared_ptr > channels( + sr_dev->channels()); + + // 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()); + + 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()) - offset += -extents.first; - r->set_v_offset(offset); - if (r->enabled()) - offset += extents.second; + 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 + TraceTreeItemOwner *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; + } + + // Assign proper vertical offsets to each channel in the group + new_trace_group->restack_items(); + + // 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 logic channels in a group + vector< shared_ptr > logic_channels; + copy_if(channels.begin(), channels.end(), back_inserter(logic_channels), + [](const shared_ptr& c) { + return c->type() == sigrok::ChannelType::LOGIC; }); + + const vector< shared_ptr > non_grouped_logic_signals = + extract_new_traces_for_channels(logic_channels, signal_map, add_traces); + + if (non_grouped_logic_signals.size() > 0) { + const shared_ptr non_grouped_trace_group( + make_shared()); + for (shared_ptr trace : non_grouped_logic_signals) + non_grouped_trace_group->add_child_item(trace); + + non_grouped_trace_group->restack_items(); + new_top_level_items.push_back(non_grouped_trace_group); + } + + // Enqueue the remaining channels as free ungrouped traces + const vector< shared_ptr > new_top_level_signals = + extract_new_traces_for_channels(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 and position the pending top levels items + for (auto item : new_top_level_items) { + // Position the item after the last item or at the top if there is none + int offset = v_extents().second; + + add_child_item(item); + item->force_to_v_offset(offset); + + const pair extents = item->v_extents(); + if (item->enabled()) + offset += (extents.second - extents.first); } update_layout(); - normalize_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(); + if (state == Session::Running) { + set_time_unit(util::TimeUnit::Samples); + + trigger_markers_.clear(); + } - // Repaint the view - _viewport->update(); + 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::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; + 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(); - signals_moved(); + ruler_->update(); + viewport_->update(); } -void View::on_geometry_updated() +void View::process_sticky_events() { - update_layout(); + if (sticky_events_ & TraceTreeItemHExtentsChanged) + update_layout(); + if (sticky_events_ & TraceTreeItemVExtentsChanged) { + restack_all_trace_tree_items(); + update_scroll(); + } + + // Clear the sticky events + sticky_events_ = 0; } void View::on_hover_point_changed() { - for (shared_ptr r : *this) + const vector> trace_tree_items( + list_by_type()); + for (shared_ptr r : trace_tree_items) r->hover_point_changed(); }