X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=11026883bab1a7842dba1483c1c58c8b0650cb72;hp=cf990bcdced9f7cf44eeac9b149f2942cb8c2cc9;hb=50f97924a2de49393de617a891190f053825454f;hpb=8b2e2a9acef9501910047881edd54dd092b9732f diff --git a/pv/view/view.cpp b/pv/view/view.cpp index cf990bcd..11026883 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -26,12 +26,11 @@ #include #include -#include - #include #include #include +#include "cursorheader.h" #include "decodetrace.h" #include "header.h" #include "ruler.h" @@ -43,8 +42,6 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" -using boost::shared_ptr; -using boost::weak_ptr; using pv::data::SignalData; using std::deque; using std::list; @@ -53,7 +50,9 @@ 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 +75,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 +92,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 +110,29 @@ 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())); 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() @@ -169,7 +182,8 @@ void View::zoom_fit() if (w <= 0) return; - set_scale_offset(delta / w, extents.first); + const double scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale, extents.first); } void View::zoom_one_to_one() @@ -180,16 +194,12 @@ void View::zoom_one_to_one() 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()); } @@ -212,6 +222,7 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->update(); + _cursorheader->update(); _viewport->update(); scale_offset_changed(); } @@ -229,7 +240,7 @@ vector< shared_ptr > View::get_traces() const vector< shared_ptr > traces(sigs.size()); #endif - vector< shared_ptr >::iterator i = traces.begin(); + auto i = traces.begin(); i = copy(sigs.begin(), sigs.end(), i); #ifdef ENABLE_DECODE i = copy(decode_sigs.begin(), decode_sigs.end(), i); @@ -245,7 +256,7 @@ list > View::selected_items() const // List the selected signals const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH (shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); if (t->selected()) items.push_back(t); @@ -267,7 +278,7 @@ set< shared_ptr > View::get_visible_data() const // 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()); @@ -281,7 +292,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(); @@ -304,7 +315,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -313,7 +324,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(); } @@ -337,11 +348,11 @@ void View::normalize_layout() const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) v_min = min(t->get_v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr t, traces) + for (shared_ptr t : traces) t->set_v_offset(t->get_v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); @@ -404,12 +415,17 @@ 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(); } @@ -429,7 +445,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()); @@ -455,6 +471,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: @@ -482,6 +501,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -496,7 +516,7 @@ void View::signals_changed() { int offset = SignalMargin + SignalHeight; const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { t->set_view(this); t->set_v_offset(offset); offset += SignalHeight + 2 * SignalMargin; @@ -517,7 +537,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); }