X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3619ba0694d8f4bc48c5c8a97368e9f005192a9e;hp=7d3dc7f628a73b9bd5e4be03d6c8a6e45e33dfb2;hb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;hpb=f76af6375b8aea6b7edb2d6ee838e1589c3490f3 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 7d3dc7f6..3619ba06 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -30,12 +30,13 @@ #include "header.h" #include "ruler.h" +#include "signal.h" #include "view.h" #include "viewport.h" -#include "../logicdata.h" -#include "../logicdatasnapshot.h" -#include "../sigsession.h" +#include "pv/sigsession.h" +#include "pv/data/logic.h" +#include "pv/data/logicsnapshot.h" using namespace boost; using namespace std; @@ -51,10 +52,14 @@ const int View::RulerHeight = 30; const int View::MaxScrollValue = INT_MAX / 2; -const int View::SignalHeight = 50; +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), @@ -65,18 +70,39 @@ View::View(SigSession &session, QWidget *parent) : _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)), this, SLOT(h_scroll_value_changed(int))); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(v_scroll_value_changed(int))); + + connect(&_session, SIGNAL(signals_changed()), + this, SLOT(signals_changed())); connect(&_session, SIGNAL(data_updated()), this, SLOT(data_updated())); + connect(_cursors.first().get(), SIGNAL(time_changed()), + this, SLOT(marker_time_changed())); + connect(_cursors.second().get(), SIGNAL(time_changed()), + this, SLOT(marker_time_changed())); + + connect(_header, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); + + connect(_header, SIGNAL(selection_changed()), + _ruler, SLOT(clear_selection())); + connect(_ruler, SIGNAL(selection_changed()), + _header, SLOT(clear_selection())); + + connect(_header, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + connect(_ruler, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0); setViewport(_viewport); @@ -133,6 +159,27 @@ void View::set_scale_offset(double scale, double offset) _viewport->update(); } +list > View::selected_items() const +{ + list > items; + + // List the selected signals + const vector< shared_ptr > sigs(_session.get_signals()); + BOOST_FOREACH (shared_ptr s, sigs) { + assert(s); + if (s->selected()) + items.push_back(s); + } + + // List the selected cursors + if (_cursors.first()->selected()) + items.push_back(_cursors.first()); + if (_cursors.second()->selected()) + items.push_back(_cursors.second()); + + return items; +} + bool View::cursors_shown() const { return _show_cursors; @@ -145,7 +192,21 @@ void View::show_cursors(bool show) _viewport->update(); } -std::pair& View::cursors() +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(); + _viewport->update(); +} + +CursorPair& View::cursors() +{ + return _cursors; +} + +const CursorPair& View::cursors() const { return _cursors; } @@ -155,10 +216,26 @@ const QPoint& View::hover_point() const return _hover_point; } +void View::normalize_layout() +{ + const 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); + + verticalScrollBar()->setSliderPosition(_v_offset + delta); + v_scroll_value_changed(verticalScrollBar()->sliderPosition()); +} + void View::get_scroll_layout(double &length, double &offset) const { - const shared_ptr sig_data = _session.get_data(); - if(!sig_data) + const shared_ptr sig_data = _session.get_data(); + if (!sig_data) return; length = _data_length / (sig_data->get_samplerate() * _scale); @@ -176,9 +253,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); + + _updating_scroll = true; - if(length < MaxScrollValue) { + if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); horizontalScrollBar()->setSliderPosition(offset); } else { @@ -187,30 +266,33 @@ 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() - areaSize.height()); + _viewport->get_total_height() + SignalMargin - + areaSize.height()); } 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) _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(); } @@ -234,7 +316,7 @@ bool View::viewportEvent(QEvent *e) } } -void View::resizeEvent(QResizeEvent *e) +void View::resizeEvent(QResizeEvent*) { _ruler->setGeometry(_viewport->x(), 0, _viewport->width(), _viewport->y()); @@ -245,8 +327,11 @@ void View::resizeEvent(QResizeEvent *e) 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; @@ -265,16 +350,29 @@ void View::v_scroll_value_changed(int value) _viewport->update(); } +void View::signals_changed() +{ + int offset = SignalMargin + SignalHeight; + const vector< shared_ptr > sigs(_session.get_signals()); + BOOST_FOREACH(shared_ptr s, sigs) { + s->init_context_bar_actions(NULL); + s->set_v_offset(offset); + offset += SignalHeight + 2 * SignalMargin; + } + + normalize_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 = + 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) + BOOST_FOREACH(shared_ptr s, snapshots) + if (s) _data_length = max(_data_length, s->get_sample_count()); } @@ -286,5 +384,17 @@ void View::data_updated() _viewport->update(); } +void View::marker_time_changed() +{ + _ruler->update(); + _viewport->update(); +} + +void View::on_signals_moved() +{ + update_scroll(); + signals_moved(); +} + } // namespace view } // namespace pv