X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=a437918d9f2a88f3001f35ae9eb33b854530924c;hp=0f9edb3f39719d53a2d991f2a25383e89386e0e6;hb=1bc6525bd6274b7f06f5fa8355b539dd9307f599;hpb=528bd8a194362b7e73d53360ec78ec22f06eecc2 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 0f9edb3f..a437918d 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE +#include +#endif + #include #include #include @@ -28,6 +32,7 @@ #include #include +#include "decodetrace.h" #include "header.h" #include "ruler.h" #include "signal.h" @@ -38,8 +43,17 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" -using namespace boost; -using namespace std; +using boost::shared_ptr; +using boost::weak_ptr; +using pv::data::SignalData; +using std::deque; +using std::list; +using std::max; +using std::make_pair; +using std::min; +using std::pair; +using std::set; +using std::vector; namespace pv { namespace view { @@ -47,9 +61,6 @@ 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; @@ -66,14 +77,12 @@ View::View(SigSession &session, QWidget *parent) : _viewport(new Viewport(*this)), _ruler(new Ruler(*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)), @@ -86,15 +95,26 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(data_updated()), 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(geometry_updated()), + this, SLOT(on_geometry_updated())); connect(_header, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); - setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0); + 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())); + setViewport(_viewport); _viewport->installEventFilter(this); @@ -107,6 +127,11 @@ SigSession& View::session() return _session; } +const SigSession& View::session() const +{ + return _session; +} + double View::scale() const { return _scale; @@ -124,21 +149,63 @@ int View::v_offset() const 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; + const double new_scale = max(min(_scale * pow(3.0/2.0, -steps), + MaxScale), MinScale); + set_zoom(new_scale, 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; + + set_scale_offset(delta / w, extents.first); } +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()); + + if (visible_data.empty()) + return; + + double samplerate = 0.0; + BOOST_FOREACH(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) { @@ -148,6 +215,84 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->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); + } + + // List the selected cursors + if (_cursors.first()->selected()) + items.push_back(_cursors.first()); + if (_cursors.second()->selected()) + items.push_back(_cursors.second()); + + return items; +} + +set< shared_ptr > View::get_visible_data() const +{ + 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()); + + 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; + BOOST_FOREACH(const shared_ptr d, visible_data) + { + const double start_time = d->get_start_time(); + left_time = min(left_time, start_time); + right_time = max(right_time, start_time + + d->get_max_sample_count() / d->samplerate()); + } + + assert(left_time < right_time); + return make_pair(left_time, right_time); } bool View::cursors_shown() const @@ -162,7 +307,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; } @@ -174,30 +333,41 @@ const QPoint& View::hover_point() const void View::normalize_layout() { - const vector< shared_ptr > sigs(_session.get_signals()); + const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr s, sigs) - v_min = min(s->get_v_offset(), v_min); + BOOST_FOREACH(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 s, sigs) - s->set_v_offset(s->get_v_offset() + delta); + BOOST_FOREACH(shared_ptr t, traces) + t->set_v_offset(t->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 +void View::update_viewport() { - const shared_ptr sig_data = _session.get_data(); - if (!sig_data) - return; + assert(_viewport); + _viewport->update(); +} - length = _data_length / (sig_data->get_samplerate() * _scale); +void View::get_scroll_layout(double &length, double &offset) const +{ + 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); @@ -209,7 +379,7 @@ 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; @@ -231,16 +401,23 @@ void View::update_scroll() areaSize.height()); } -void View::reset_signal_layout() +void View::update_layout() { - int offset = SignalMargin + SignalHeight; - const 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(), + _ruler->sizeHint().height(), 0, 0); + _ruler->setGeometry(_viewport->x(), 0, + _viewport->width(), _viewport->y()); + _header->setGeometry(0, _viewport->y(), + _viewport->x(), _viewport->height()); + update_scroll(); +} - normalize_layout(); +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) @@ -286,11 +463,7 @@ bool View::viewportEvent(QEvent *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::h_scroll_value_changed(int value) @@ -320,23 +493,20 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - reset_signal_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); + offset += SignalHeight + 2 * SignalMargin; + } + + update_layout(); + 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 = - 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(); @@ -356,5 +526,10 @@ void View::on_signals_moved() signals_moved(); } +void View::on_geometry_updated() +{ + update_layout(); +} + } // namespace view } // namespace pv