X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=1cb9ce7154a9c302f15e3ecb63637f109f84286a;hp=b0e08f6f1cfa16fb957284b99232f4206b7eea67;hb=aca64cac30aadeee90510958b081cd385221b258;hpb=9555ca8b3fdddd62496ebaaada2d9c0f980df03e diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index b0e08f6f..1cb9ce71 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -22,8 +22,12 @@ extern "C" { #include } +#include + #include +#include + #include #include @@ -33,6 +37,7 @@ extern "C" { #include #include #include +#include #include "decodetrace.h" @@ -44,17 +49,22 @@ extern "C" { #include #include #include +#include #include #include +using boost::shared_lock; +using boost::shared_mutex; using std::dynamic_pointer_cast; using std::list; +using std::lock_guard; using std::make_pair; using std::max; using std::map; using std::min; using std::pair; using std::shared_ptr; +using std::tie; using std::vector; namespace pv { @@ -145,12 +155,6 @@ const std::shared_ptr& DecodeTrace::decoder() const return _decoder_stack; } -void DecodeTrace::set_view(pv::view::View *view) -{ - assert(view); - Trace::set_view(view); -} - void DecodeTrace::paint_back(QPainter &p, int left, int right) { Trace::paint_back(p, left, right); @@ -176,14 +180,13 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) } // Iterate through the rows - assert(_view); int y = get_y(); pair sample_range = get_sample_range(left, right); assert(_decoder_stack); const vector rows(_decoder_stack->get_visible_rows()); - _cur_row_headings.clear(); + _visible_rows.clear(); for (size_t i = 0; i < rows.size(); i++) { const Row &row = rows[i]; @@ -204,7 +207,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) base_colour); y += _row_height; - _cur_row_headings.push_back(row.title()); + _visible_rows.push_back(rows[i]); } } @@ -220,7 +223,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right) assert(_row_height); - for (size_t i = 0; i < _cur_row_headings.size(); i++) + for (size_t i = 0; i < _visible_rows.size(); i++) { const int y = i * _row_height + get_y(); @@ -239,7 +242,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right) const QRect r(left + ArrowSize * 2, y - _row_height / 2, right - left, _row_height); - const QString h(_cur_row_headings[i]); + const QString h(_visible_rows[i].title()); const int f = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip; @@ -326,8 +329,9 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, QColor text_color, int h, int left, int right, int y, size_t base_colour) const { - const double samples_per_pixel = get_samples_per_pixel(); - const double pixels_offset = get_pixels_offset(); + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); const double start = a.start_sample() / samples_per_pixel - pixels_offset; @@ -452,6 +456,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, using namespace pv::data; using pv::data::decode::Decoder; + double samples_per_pixel, pixels_offset; + assert(_decoder_stack); shared_ptr data; @@ -484,8 +490,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, const int y = get_y(); - const double samples_per_pixel = get_samples_per_pixel(); - const double pixels_offset = get_pixels_offset(); + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); const double start = max(samples_decoded / samples_per_pixel - pixels_offset, left - 1.0); @@ -502,52 +508,121 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, p.drawRect(no_decode_rect); } -double DecodeTrace::get_pixels_offset() const +pair DecodeTrace::get_pixels_offset_samples_per_pixel() const { - assert(_view); + assert(_owner); assert(_decoder_stack); - const double scale = _view->scale(); - assert(scale > 0); - - return (_view->offset() - _decoder_stack->get_start_time()) / scale; -} - -double DecodeTrace::get_samples_per_pixel() const -{ - assert(_view); - assert(_decoder_stack); + const View *view = _owner->view(); + assert(view); - const double scale = _view->scale(); + const double scale = view->scale(); assert(scale > 0); + const double pixels_offset = + (view->offset() - _decoder_stack->get_start_time()) / scale; + double samplerate = _decoder_stack->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) samplerate = 1.0; - return samplerate * scale; + return make_pair(pixels_offset, samplerate * scale); } -pair DecodeTrace::get_sample_range(int x_start, int x_end) const +pair DecodeTrace::get_sample_range( + int x_start, int x_end) const { - assert(_view); - assert(_decoder_stack); + double samples_per_pixel, pixels_offset; + tie(pixels_offset, samples_per_pixel) = + get_pixels_offset_samples_per_pixel(); + + const uint64_t start = (uint64_t)max( + (x_start + pixels_offset) * samples_per_pixel, 0.0); + const uint64_t end = (uint64_t)max( + (x_end + pixels_offset) * samples_per_pixel, 0.0); + + return make_pair(start, end); +} - const double samples_per_pixel = get_samples_per_pixel(); - const double pixels_offset = get_pixels_offset(); +int DecodeTrace::get_row_at_point(const QPoint &point) +{ + if (!_row_height) + return -1; - uint64_t start, end; + const int row = (point.y() - get_y() + _row_height / 2) / _row_height; + if (row < 0 || row >= (int)_visible_rows.size()) + return -1; - start = (uint64_t)max((x_start + pixels_offset) * samples_per_pixel, 0.0); - end = (uint64_t)max((x_end + pixels_offset) * samples_per_pixel, 0.0); + return row; +} - return make_pair(start, end); +const QString DecodeTrace::get_annotation_at_point(const QPoint &point) +{ + using namespace pv::data::decode; + + if (!enabled()) + return QString(); + + const pair sample_range = + get_sample_range(point.x(), point.x() + 1); + const int row = get_row_at_point(point); + if (row < 0) + return QString(); + + vector annotations; + + assert(_decoder_stack); + _decoder_stack->get_annotation_subset(annotations, _visible_rows[row], + sample_range.first, sample_range.second); + + return (annotations.empty()) ? + QString() : annotations[0].annotations().front(); +} + +void DecodeTrace::hide_hover_annotation() +{ + QToolTip::hideText(); } void DecodeTrace::hover_point_changed() { + assert(_owner); + + const View *const view = _owner->view(); + assert(view); + + QPoint hp = view->hover_point(); + QString ann = get_annotation_at_point(hp); + + assert(view); + assert(_row_height); + + if (ann.isEmpty()) { + hide_hover_annotation(); + return; + } + + const int hover_row = get_row_at_point(hp); + + QFontMetrics m(QToolTip::font()); + const QRect text_size = m.boundingRect(QRect(), 0, ann); + + // This is OS-specific and unfortunately we can't query it, so + // use an approximation to at least try to minimize the error. + const int padding = 8; + + // Make sure the tool tip doesn't overlap with the mouse cursor. + // If it did, the tool tip would constantly hide and re-appear. + // We also push it up by one row so that it appears above the + // decode trace, not below. + hp.setX(hp.x() - (text_size.width() / 2) - padding); + + hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height) + - _row_height - text_size.height()); + + QToolTip::showText(view->viewport()->mapToGlobal(hp), ann); } void DecodeTrace::create_decoder_form(int index, @@ -622,7 +697,8 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - const vector< shared_ptr > sigs = _session.get_signals(); + shared_lock lock(_session.signals_mutex()); + const vector< shared_ptr > &sigs(_session.signals()); assert(_decoder_stack); const auto channel_iter = dec->channels().find(pdch); @@ -640,7 +716,7 @@ QComboBox* DecodeTrace::create_channel_selector( if (dynamic_pointer_cast(s) && s->enabled()) { - selector->addItem(s->get_name(), + selector->addItem(s->name(), qVariantFromValue((void*)s.get())); if ((*channel_iter).second == s) selector->setCurrentIndex(i + 1); @@ -655,7 +731,9 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec assert(dec); map > channel_map; - const vector< shared_ptr > sigs = _session.get_signals(); + + shared_lock lock(_session.signals_mutex()); + const vector< shared_ptr > &sigs(_session.signals()); for (const ChannelSelector &s : _channel_selectors) { @@ -688,8 +766,8 @@ void DecodeTrace::commit_channels() void DecodeTrace::on_new_decode_data() { - if (_view) - _view->update_viewport(); + if (_owner) + _owner->update_viewport(); } void DecodeTrace::delete_pressed() @@ -748,7 +826,7 @@ void DecodeTrace::on_show_hide_decoder(int index) assert(index < (int)_decoder_forms.size()); _decoder_forms[index]->set_decoder_visible(show); - _view->update_viewport(); + _owner->update_viewport(); } } // namespace view