X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3b8508329cac79f1ee13fffd1e3f01d92844c9d9;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hp=7a444f7c47f68b1032e6a0b359366afb4272e50f;hpb=69dd2b030f0bf289fe3132cf3c0f3725c578a916;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 7a444f7c..3b850832 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -18,28 +18,54 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include +#ifdef ENABLE_DECODE +#include +#endif -#include +#include +#include +#include +#include +#include #include #include #include +#include + +#include "cursorheader.h" +#include "decodetrace.h" #include "header.h" +#include "logicsignal.h" #include "ruler.h" #include "signal.h" +#include "tracegroup.h" #include "view.h" #include "viewport.h" -#include "../logicdata.h" -#include "../logicdatasnapshot.h" -#include "../sigsession.h" - -using namespace boost; -using namespace std; +#include "pv/sigsession.h" +#include "pv/data/logic.h" +#include "pv/data/logicsnapshot.h" + +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; namespace pv { namespace view { @@ -47,15 +73,8 @@ namespace view { const double View::MaxScale = 1e9; const double View::MinScale = 1e-15; -const int View::LabelMarginWidth = 70; -const int View::RulerHeight = 30; - 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); @@ -65,14 +84,14 @@ View::View(SigSession &session, QWidget *parent) : _session(session), _viewport(new Viewport(*this)), _ruler(new Ruler(*this)), + _cursorheader(new CursorHeader(*this)), _header(new Header(*this)), - _data_length(0), _scale(1e-6), _offset(0), _v_offset(0), + _updating_scroll(false), _show_cursors(false), - _cursors(pair(Cursor(*this, 0.0), - Cursor(*this, 1.0))), + _cursors(*this), _hover_point(-1, -1) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), @@ -82,23 +101,52 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(signals_changed()), this, SLOT(signals_changed())); - connect(&_session, SIGNAL(data_updated()), + connect(&_session, SIGNAL(capture_state_changed(int)), + this, SLOT(data_updated())); + connect(&_session, SIGNAL(data_received()), + this, SLOT(data_updated())); + connect(&_session, SIGNAL(frame_ended()), this, SLOT(data_updated())); - connect(&_cursors.first, SIGNAL(time_changed()), + connect(_cursors.first().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(&_cursors.second, SIGNAL(time_changed()), + connect(_cursors.second().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); connect(_header, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); - setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0); + connect(_header, SIGNAL(selection_changed()), + _cursorheader, SLOT(clear_selection())); + connect(_cursorheader, SIGNAL(selection_changed()), + _header, SLOT(clear_selection())); + + connect(_header, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + connect(_cursorheader, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + + connect(this, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); + + 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); + + // 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(); } SigSession& View::session() @@ -106,6 +154,31 @@ SigSession& View::session() return _session; } +const SigSession& View::session() const +{ + return _session; +} + +View* View::view() +{ + return this; +} + +const View* View::view() const +{ + return this; +} + +Viewport* View::viewport() +{ + return _viewport; +} + +const Viewport* View::viewport() const +{ + return _viewport; +} + double View::scale() const { return _scale; @@ -116,28 +189,67 @@ double View::offset() const return _offset; } -int View::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, (width() - LabelMarginWidth) / 2); + zoom(steps, _viewport->width() / 2); } void View::zoom(double steps, int offset) { - const double cursor_offset = _offset + _scale * offset; - _scale *= pow(3.0/2.0, -steps); - _scale = max(min(_scale, MaxScale), MinScale); - _offset = cursor_offset - _scale * offset; + set_zoom(_scale * pow(3.0/2.0, -steps), offset); +} - _ruler->update(); - _viewport->update(); - update_scroll(); +void View::zoom_fit() +{ + 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(); + if (w <= 0) + return; + + const double scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale, extents.first); } +void View::zoom_one_to_one() +{ + using pv::data::SignalData; + + // Make a set of all the visible data objects + set< shared_ptr > visible_data = get_visible_data(); + 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(); + if (w <= 0) + return; + + set_zoom(1.0 / samplerate, w / 2); +} void View::set_scale_offset(double scale, double offset) { @@ -146,7 +258,45 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->update(); + _cursorheader->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()); + + // Make a set of all the visible data objects + set< shared_ptr > visible_data; + for (const shared_ptr sig : sigs) + if (sig->enabled()) + visible_data.insert(sig->data()); + + return visible_data; +} + +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; + 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); + } + + assert(left_time < right_time); + return make_pair(left_time, right_time); } bool View::cursors_shown() const @@ -157,11 +307,25 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _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(); } -std::pair& View::cursors() +CursorPair& View::cursors() +{ + return _cursors; +} + +const CursorPair& View::cursors() const { return _cursors; } @@ -171,32 +335,50 @@ const QPoint& View::hover_point() const return _hover_point; } -void View::normalize_layout() +void View::update_viewport() { - vector< shared_ptr > &sigs = _session.get_signals(); - - int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr s, sigs) - v_min = min(s->get_v_offset(), v_min); - - const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr s, sigs) - s->set_v_offset(s->get_v_offset() + delta); + assert(_viewport); + _viewport->update(); + _header->update(); +} - verticalScrollBar()->setSliderPosition(_v_offset + delta); - v_scroll_value_changed(verticalScrollBar()->sliderPosition()); +void View::restack_all_row_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()); + 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 shared_ptr sig_data = _session.get_data(); - if(!sig_data) - return; - - length = _data_length / (sig_data->get_samplerate() * _scale); + const pair extents = get_time_extents(); + 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 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::update_scroll() { assert(_viewport); @@ -208,9 +390,11 @@ void View::update_scroll() get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); - horizontalScrollBar()->setPageStep(areaSize.width()); + horizontalScrollBar()->setPageStep(areaSize.width() / 2); - if(length < MaxScrollValue) { + _updating_scroll = true; + + if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); horizontalScrollBar()->setSliderPosition(offset); } else { @@ -219,43 +403,103 @@ void View::update_scroll() _offset * MaxScrollValue / (_scale * length)); } + _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::reset_signal_layout() +void View::update_layout() { - int offset = SignalMargin; - vector< shared_ptr > &sigs = _session.get_signals(); - BOOST_FOREACH(shared_ptr s, sigs) { - s->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; + 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()); + update_scroll(); +} + +void View::paint_label(QPainter &p, int right, bool hover) +{ + (void)p; + (void)right; + (void)hover; +} + +QRectF View::label_rect(int right) +{ + (void)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; } - normalize_layout(); + 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) { + if (type == QEvent::MouseMove) { const QMouseEvent *const mouse_event = (QMouseEvent*)event; - if(object == _viewport) + if (object == _viewport) _hover_point = mouse_event->pos(); - else if(object == _ruler) + else if (object == _ruler || object == _cursorheader) _hover_point = QPoint(mouse_event->x(), 0); - else if(object == _header) + else if (object == _header) _hover_point = QPoint(0, mouse_event->y()); else _hover_point = QPoint(-1, -1); hover_point_changed(); - } else if(type == QEvent::Leave) { + } else if (type == QEvent::Leave) { _hover_point = QPoint(-1, -1); hover_point_changed(); } @@ -272,6 +516,9 @@ bool View::viewportEvent(QEvent *e) case QEvent::MouseButtonDblClick: case QEvent::MouseMove: case QEvent::Wheel: + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: return false; default: @@ -279,19 +526,34 @@ bool View::viewportEvent(QEvent *e) } } -void View::resizeEvent(QResizeEvent *e) +void View::resizeEvent(QResizeEvent*) { - _ruler->setGeometry(_viewport->x(), 0, - _viewport->width(), _viewport->y()); - _header->setGeometry(0, _viewport->y(), - _viewport->x(), _viewport->height()); - update_scroll(); + 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) + return; + const int range = horizontalScrollBar()->maximum(); - if(range < MaxScrollValue) + if (range < MaxScrollValue) _offset = _scale * value; else { double length = 0, offset; @@ -300,6 +562,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -312,23 +575,76 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - reset_signal_layout(); + 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(); } void View::data_updated() { - // Get the new data length - _data_length = 0; - shared_ptr sig_data = _session.get_data(); - if(sig_data) { - deque< shared_ptr > &snapshots = - sig_data->get_snapshots(); - BOOST_FOREACH(shared_ptr s, snapshots) - if(s) - _data_length = max(_data_length, - s->get_sample_count()); - } - // Update the scroll bars update_scroll(); @@ -338,7 +654,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -348,5 +664,22 @@ void View::on_signals_moved() signals_moved(); } +void View::process_sticky_events() +{ + 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() +{ + for (shared_ptr r : *this) + r->hover_point_changed(); +} + } // namespace view } // namespace pv