X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=d621e7143f8a2f189bd06329fb020d0cf26cfb7d;hp=7a55bbb3fd2776fc7c38afae05864a5e2649b683;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=eae6e30af53f6b3e42dc5be212c82870078276b0 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 7a55bbb3..d621e714 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,36 +22,48 @@ #include #endif -#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 "pv/sigsession.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" +#include "cursorheader.hpp" +#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.hpp" +#include "pv/data/logic.hpp" +#include "pv/data/logicsnapshot.hpp" + +using boost::shared_lock; +using boost::shared_mutex; using pv::data::SignalData; using std::back_inserter; using std::deque; +using std::dynamic_pointer_cast; using std::list; +using std::lock_guard; using std::max; using std::make_pair; using std::min; using std::pair; using std::set; using std::shared_ptr; +using std::unordered_map; +using std::unordered_set; using std::vector; using std::weak_ptr; @@ -63,90 +75,88 @@ const double View::MinScale = 1e-15; const int View::MaxScrollValue = INT_MAX / 2; -const int View::SignalHeight = 30; -const int View::SignalMargin = 10; -const int View::SignalSnapGridSize = 10; - const QColor View::CursorAreaColour(220, 231, 243); const QSizeF View::LabelPadding(4, 0); View::View(SigSession &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)), + 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) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(v_scroll_value_changed(int))); - 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(data_updated())); - connect(&_session, SIGNAL(data_received()), + connect(&session_, SIGNAL(data_received()), this, SLOT(data_updated())); - connect(&_session, SIGNAL(frame_ended()), + connect(&session_, SIGNAL(frame_ended()), this, SLOT(data_updated())); - connect(_cursors.first().get(), SIGNAL(time_changed()), + connect(cursors_.first().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(_cursors.second().get(), SIGNAL(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()), + 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()), + cursorheader_, SLOT(clear_selection())); + connect(cursorheader_, 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(cursorheader_, 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); + + setViewport(viewport_); - _viewport->installEventFilter(this); - _ruler->installEventFilter(this); - _cursorheader->installEventFilter(this); - _header->installEventFilter(this); + viewport_->installEventFilter(this); + ruler_->installEventFilter(this); + cursorheader_->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(); + cursorheader_->raise(); + header_->raise(); } SigSession& View::session() { - return _session; + return session_; } const SigSession& View::session() const { - return _session; + return session_; } View* View::view() @@ -161,37 +171,42 @@ const View* View::view() const Viewport* View::viewport() { - return _viewport; + return viewport_; } const Viewport* View::viewport() const { - return _viewport; + return viewport_; } double View::scale() const { - return _scale; + return scale_; } double View::offset() const { - return _offset; + return offset_; } -int View::owner_v_offset() const +int View::owner_visual_v_offset() const { - return -_v_offset; + return -v_offset_; +} + +unsigned int View::depth() const +{ + return 0; } 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() @@ -201,8 +216,8 @@ void View::zoom_fit() if (delta < 1e-12) return; - assert(_viewport); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); if (w <= 0) return; @@ -214,9 +229,6 @@ void View::zoom_one_to_one() { using pv::data::SignalData; - const vector< shared_ptr > sigs( - session().get_signals()); - // Make a set of all the visible data objects set< shared_ptr > visible_data = get_visible_data(); if (visible_data.empty()) @@ -231,8 +243,8 @@ void View::zoom_one_to_one() if (samplerate == 0.0) return; - assert(_viewport); - const int w = _viewport->width(); + assert(viewport_); + const int w = viewport_->width(); if (w <= 0) return; @@ -241,62 +253,20 @@ void View::zoom_one_to_one() void View::set_scale_offset(double scale, double offset) { - _scale = scale; - _offset = offset; + scale_ = scale; + offset_ = offset; update_scroll(); - _ruler->update(); - _cursorheader->update(); - _viewport->update(); + ruler_->update(); + cursorheader_->update(); + viewport_->update(); scale_offset_changed(); } -vector< shared_ptr > View::child_items() const -{ - vector< shared_ptr > row_items; - - const vector< shared_ptr > sigs( - session().get_signals()); - copy(sigs.begin(), sigs.end(), back_inserter(row_items)); - -#ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( - session().get_decode_signals()); - copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(row_items)); -#endif - - stable_sort(row_items.begin(), row_items.end(), - [](const shared_ptr &a, const shared_ptr &b) { - return a->v_offset() < b->v_offset(); }); - - return row_items; -} - -list > View::selected_items() const -{ - list > items; - - // List the selected signals - const vector< shared_ptr > row_items(child_items()); - for (shared_ptr r : row_items) { - assert(r); - if (r->selected()) - items.push_back(r); - } - - // List the selected cursors - if (_cursors.first()->selected()) - items.push_back(_cursors.first()); - if (_cursors.second()->selected()) - items.push_back(_cursors.second()); - - return items; -} - set< shared_ptr > View::get_visible_data() const { - const vector< shared_ptr > sigs( - session().get_signals()); + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); // Make a set of all the visible data objects set< shared_ptr > visible_data; @@ -331,72 +301,79 @@ pair View::get_time_extents() const 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; + cursorheader_->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); + cursorheader_->update(); + viewport_->update(); } CursorPair& View::cursors() { - return _cursors; + return cursors_; } const CursorPair& View::cursors() const { - return _cursors; + return cursors_; } const QPoint& View::hover_point() const { - return _hover_point; + return hover_point_; } -void View::normalize_layout() +void View::update_viewport() { - const vector< shared_ptr > row_items(child_items()); + assert(viewport_); + viewport_->update(); + header_->update(); +} - int v_min = INT_MAX; - for (const shared_ptr r : row_items) - v_min = min(r->v_offset(), v_min); +void View::restack_all_row_items() +{ + // Make a set of owners + unordered_set< RowItemOwner* > owners; + for (const auto &r : *this) + owners.insert(r->owner()); - const int delta = -min(v_min, 0); - for (shared_ptr r : row_items) - r->set_v_offset(r->v_offset() + delta); + // Make a list that is sorted from deepest first + 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(); }); - verticalScrollBar()->setSliderPosition(_v_offset + delta); - v_scroll_value_changed(verticalScrollBar()->sliderPosition()); -} + // Restack the items recursively + for (auto &o : sorted_owners) + o->restack_items(); -void View::update_viewport() -{ - assert(_viewport); - _viewport->update(); + // 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; + 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); @@ -404,9 +381,9 @@ void View::set_zoom(double scale, int offset) 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; @@ -415,7 +392,7 @@ void View::update_scroll() horizontalScrollBar()->setPageStep(areaSize.width() / 2); - _updating_scroll = true; + updating_scroll_ = true; if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); @@ -423,31 +400,33 @@ 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()->setRange(0, - _viewport->get_total_height() + SignalMargin - - areaSize.height()); + + 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); } 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(), 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()); update_scroll(); } @@ -464,25 +443,64 @@ QRectF View::label_rect(int right) return QRectF(); } +bool View::add_channels_to_owner( + const vector< shared_ptr > &channels, + RowItemOwner *owner, int &offset, + unordered_map, shared_ptr > + &signal_map, + std::function)> filter_func) +{ + bool any_added = false; + + assert(owner); + + for (const auto &channel : channels) + { + const auto iter = signal_map.find(channel); + if (iter == signal_map.end() || + (filter_func && !filter_func((*iter).second))) + continue; + + shared_ptr row_item = (*iter).second; + owner->add_child_item(row_item); + apply_offset(row_item, offset); + signal_map.erase(iter); + + any_added = true; + } + + return any_added; +} + +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; +} + 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_ || object == cursorheader_) + 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(); } @@ -513,44 +531,116 @@ void View::resizeEvent(QResizeEvent*) update_layout(); } +void View::appearance_changed(bool label, bool content) +{ + if (label) + header_->update(); + if (content) + viewport_->update(); +} + +void View::extents_changed(bool horz, bool vert) +{ + sticky_events_ |= + (horz ? SelectableItemHExtentsChanged : 0) | + (vert ? SelectableItemVExtentsChanged : 0); + lazy_event_handler_.start(); +} + void View::h_scroll_value_changed(int value) { - if (_updating_scroll) + if (updating_scroll_) return; 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(); + cursorheader_->update(); + viewport_->update(); } void View::v_scroll_value_changed(int value) { - _v_offset = value; - _header->update(); - _viewport->update(); + v_offset_ = value; + header_->update(); + viewport_->update(); } void View::signals_changed() { - int offset = SignalMargin + SignalHeight; - const vector< shared_ptr > row_items(child_items()); - for (shared_ptr r : row_items) { - r->set_owner(this); - r->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; + int offset = 0; + + // Populate the traces + clear_child_items(); + + shared_ptr device = session_.device(); + assert(device); + + // Collect a set of signals + unordered_map, shared_ptr > + signal_map; + + shared_lock lock(session_.signals_mutex()); + const vector< shared_ptr > &sigs(session_.signals()); + + for (const shared_ptr &sig : sigs) + signal_map[sig->channel()] = sig; + + // Populate channel groups + for (auto entry : device->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); + } } + // Add the remaining logic channels + shared_ptr logic_trace_group(new TraceGroup()); + int child_offset = 0; + + 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; + })) + + { + add_child_item(logic_trace_group); + apply_offset(logic_trace_group, offset); + } + + // Add the remaining channels + add_channels_to_owner(device->channels(), this, offset, signal_map); + assert(signal_map.empty()); + + // 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); + } +#endif + update_layout(); - normalize_layout(); } void View::data_updated() @@ -559,13 +649,13 @@ void View::data_updated() update_scroll(); // Repaint the view - _viewport->update(); + viewport_->update(); } void View::marker_time_changed() { - _cursorheader->update(); - _viewport->update(); + cursorheader_->update(); + viewport_->update(); } void View::on_signals_moved() @@ -574,15 +664,20 @@ void View::on_signals_moved() signals_moved(); } -void View::on_geometry_updated() +void View::process_sticky_events() { - update_layout(); + if (sticky_events_ & SelectableItemHExtentsChanged) + update_layout(); + if (sticky_events_ & SelectableItemVExtentsChanged) + restack_all_row_items(); + + // Clear the sticky events + sticky_events_ = 0; } void View::on_hover_point_changed() { - const vector< shared_ptr > row_items(child_items()); - for (shared_ptr r : row_items) + for (shared_ptr r : *this) r->hover_point_changed(); }