X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=2cb3f3ed9b6f3dd1f2591b94911b150004f4ba94;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=d33d4ec95065a7eaae9ea2570d5eff5f3795c876;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index d33d4ec9..2cb3f3ed 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -30,6 +30,7 @@ #include #include +#include "cursorheader.h" #include "decodetrace.h" #include "header.h" #include "ruler.h" @@ -42,6 +43,7 @@ #include "pv/data/logicsnapshot.h" using pv::data::SignalData; +using std::back_inserter; using std::deque; using std::list; using std::max; @@ -74,6 +76,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), @@ -90,6 +93,8 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(signals_changed()), this, SLOT(signals_changed())); + 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()), @@ -106,24 +111,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() @@ -136,6 +149,16 @@ const SigSession& View::session() const return _session; } +Viewport* View::viewport() +{ + return _viewport; +} + +const Viewport* View::viewport() const +{ + return _viewport; +} + double View::scale() const { return _scale; @@ -148,7 +171,7 @@ double View::offset() const int View::v_offset() const { - return _v_offset; + return -_v_offset; } void View::zoom(double steps) @@ -213,30 +236,29 @@ 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 { + vector< shared_ptr > traces; + const vector< shared_ptr > sigs( session().get_signals()); + copy(sigs.begin(), sigs.end(), back_inserter(traces)); + #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()); + copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces)); #endif - auto 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(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->v_offset() < b->v_offset(); }); - stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); return traces; } @@ -305,7 +327,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -314,7 +336,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(); } @@ -339,11 +361,11 @@ void View::normalize_layout() int v_min = INT_MAX; for (const shared_ptr t : traces) - v_min = min(t->get_v_offset(), v_min); + v_min = min(t->v_offset(), v_min); const int delta = -min(v_min, 0); for (shared_ptr t : traces) - t->set_v_offset(t->get_v_offset() + delta); + t->set_v_offset(t->v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); v_scroll_value_changed(verticalScrollBar()->sliderPosition()); @@ -405,23 +427,20 @@ 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) -{ - assert(a); - assert(b); - return a->get_v_offset() < b->get_v_offset(); -} - bool View::eventFilter(QObject *object, QEvent *event) { const QEvent::Type type = event->type(); @@ -430,7 +449,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 +475,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 +505,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -518,7 +541,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -533,5 +556,12 @@ void View::on_geometry_updated() update_layout(); } +void View::on_hover_point_changed() +{ + const vector< shared_ptr > traces(get_traces()); + for (shared_ptr t : traces) + t->hover_point_changed(); +} + } // namespace view } // namespace pv