X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=61f017660cab050cc5ae84f0b9d626daef69bcca;hp=b0e97cb8e04e7df2d5ae558fe92ddcac0ed6c7f7;hb=aca64cac30aadeee90510958b081cd385221b258;hpb=7831112753a3a419e328d7d6b0d474435a09d6ed diff --git a/pv/view/view.cpp b/pv/view/view.cpp index b0e97cb8..61f01766 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,16 +22,16 @@ #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" @@ -43,17 +43,21 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" -using boost::shared_ptr; -using boost::weak_ptr; +using boost::shared_lock; +using boost::shared_mutex; using pv::data::SignalData; +using std::back_inserter; using std::deque; 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::vector; +using std::weak_ptr; namespace pv { namespace view { @@ -76,6 +80,7 @@ View::View(SigSession &session, QWidget *parent) : _session(session), _viewport(new Viewport(*this)), _ruler(new Ruler(*this)), + _cursorheader(new CursorHeader(*this)), _header(new Header(*this)), _scale(1e-6), _offset(0), @@ -92,7 +97,11 @@ 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().get(), SIGNAL(time_changed()), @@ -106,20 +115,32 @@ View::View(SigSession &session, QWidget *parent) : this, SLOT(on_signals_moved())); connect(_header, SIGNAL(selection_changed()), - _ruler, SLOT(clear_selection())); - connect(_ruler, 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(_ruler, 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); _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() @@ -132,6 +153,26 @@ 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; @@ -142,9 +183,9 @@ double View::offset() const return _offset; } -int View::v_offset() const +int View::owner_v_offset() const { - return _v_offset; + return -_v_offset; } void View::zoom(double steps) @@ -177,20 +218,13 @@ 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; - BOOST_FOREACH(const shared_ptr sig, sigs) - if (sig->enabled()) - visible_data.insert(sig->data()); - + set< shared_ptr > visible_data = get_visible_data(); if (visible_data.empty()) return; double samplerate = 0.0; - BOOST_FOREACH(const shared_ptr d, visible_data) { + for (const shared_ptr d : visible_data) { assert(d); samplerate = max(samplerate, d->samplerate()); } @@ -213,43 +247,20 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->update(); + _cursorheader->update(); _viewport->update(); scale_offset_changed(); } -vector< shared_ptr > View::get_traces() const -{ - const vector< shared_ptr > sigs( - session().get_signals()); -#ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( - session().get_decode_signals()); - vector< shared_ptr > traces( - sigs.size() + decode_sigs.size()); -#else - vector< shared_ptr > traces(sigs.size()); -#endif - - vector< shared_ptr >::iterator i = traces.begin(); - i = copy(sigs.begin(), sigs.end(), i); -#ifdef ENABLE_DECODE - i = copy(decode_sigs.begin(), decode_sigs.end(), i); -#endif - - stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); - return traces; -} - list > View::selected_items() const { list > items; // List the selected signals - const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH (shared_ptr t, traces) { - assert(t); - if (t->selected()) - items.push_back(t); + const vector< shared_ptr > row_items(child_items()); + for (shared_ptr r : row_items) { + if (r && r->selected()) + items.push_back(r); } // List the selected cursors @@ -263,12 +274,12 @@ list > View::selected_items() const 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; - BOOST_FOREACH(const shared_ptr sig, sigs) + for (const shared_ptr sig : sigs) if (sig->enabled()) visible_data.insert(sig->data()); @@ -282,7 +293,7 @@ pair View::get_time_extents() const return make_pair(0.0, 0.0); double left_time = DBL_MAX, right_time = DBL_MIN; - BOOST_FOREACH(const shared_ptr d, visible_data) + for (const shared_ptr d : visible_data) { const double start_time = d->get_start_time(); double samplerate = d->samplerate(); @@ -305,7 +316,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -314,7 +325,7 @@ 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); - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -335,15 +346,15 @@ const QPoint& View::hover_point() const void View::normalize_layout() { - const vector< shared_ptr > traces(get_traces()); + const vector< shared_ptr > row_items(child_items()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) - v_min = min(t->get_v_offset(), v_min); + for (const shared_ptr r : row_items) + v_min = min(r->v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr t, traces) - t->set_v_offset(t->get_v_offset() + delta); + for (shared_ptr r : row_items) + r->set_v_offset(r->v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); v_scroll_value_changed(verticalScrollBar()->sliderPosition()); @@ -405,21 +416,31 @@ void View::update_scroll() void View::update_layout() { - setViewportMargins(_header->sizeHint().width(), + 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(), - _viewport->x(), _viewport->height()); + _header->sizeHint().width(), _viewport->height()); update_scroll(); } -bool View::compare_trace_v_offsets(const shared_ptr &a, - const shared_ptr &b) +void View::paint_label(QPainter &p, int right, bool hover) { - assert(a); - assert(b); - return a->get_v_offset() < b->get_v_offset(); + (void)p; + (void)right; + (void)hover; +} + +QRectF View::label_rect(int right) +{ + (void)right; + return QRectF(); } bool View::eventFilter(QObject *object, QEvent *event) @@ -430,7 +451,7 @@ bool View::eventFilter(QObject *object, QEvent *event) const QMouseEvent *const mouse_event = (QMouseEvent*)event; 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) _hover_point = QPoint(0, mouse_event->y()); @@ -456,6 +477,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: @@ -483,6 +507,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -495,11 +520,25 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { + // Populate the traces + clear_child_items(); + + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); + for (auto s : sigs) + add_child_item(s); + +#ifdef ENABLE_DECODE + const vector< shared_ptr > decode_sigs( + session().get_decode_signals()); + for (auto s : decode_sigs) + add_child_item(s); +#endif + + // Create the initial layout int offset = SignalMargin + SignalHeight; - const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { - t->set_view(this); - t->set_v_offset(offset); + for (shared_ptr r : child_items()) { + r->set_v_offset(offset); offset += SignalHeight + 2 * SignalMargin; } @@ -518,7 +557,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -533,5 +572,12 @@ void View::on_geometry_updated() update_layout(); } +void View::on_hover_point_changed() +{ + const vector< shared_ptr > row_items(child_items()); + for (shared_ptr r : row_items) + r->hover_point_changed(); +} + } // namespace view } // namespace pv