X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=5ca665e0dff947f17ebbcbd0a5a77aa8802d1b98;hp=e4f02760eaa0b6b1719cdeb8bb323be3bd10a512;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hpb=0f290e9b8109cc5324706fa029ed7f28f462d754 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index e4f02760..5ca665e0 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -22,9 +22,12 @@ extern "C" { #include } +#include + #include -#include +#include + #include #include @@ -34,6 +37,7 @@ extern "C" { #include #include #include +#include #include "decodetrace.h" @@ -45,15 +49,23 @@ extern "C" { #include #include #include +#include #include #include -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +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::make_pair; using std::map; using std::min; +using std::pair; +using std::shared_ptr; +using std::tie; using std::vector; namespace pv { @@ -112,11 +124,13 @@ const QColor DecodeTrace::OutlineColours[16] = { }; DecodeTrace::DecodeTrace(pv::SigSession &session, - boost::shared_ptr decoder_stack, int index) : + std::shared_ptr decoder_stack, int index) : Trace(QString::fromUtf8( decoder_stack->stack().front()->decoder()->name)), _session(session), _decoder_stack(decoder_stack), + _text_height(0), + _row_height(0), _delete_mapper(this), _show_hide_mapper(this) { @@ -137,69 +151,53 @@ bool DecodeTrace::enabled() const return true; } -const boost::shared_ptr& DecodeTrace::decoder() const +const std::shared_ptr& DecodeTrace::decoder() const { return _decoder_stack; } -void DecodeTrace::set_view(pv::view::View *view) +pair DecodeTrace::v_extents() const { - assert(view); - Trace::set_view(view); + /// @todo Replace this with an implementation that knows the true + /// height of the trace + QFontMetrics m(QApplication::font()); + const int text_height = m.boundingRect(QRect(), 0, "Tg").height(); + const int row_height = (text_height * 6) / 4; + return make_pair(-row_height / 2, row_height * 7 / 2); } void DecodeTrace::paint_back(QPainter &p, int left, int right) { Trace::paint_back(p, left, right); - paint_axis(p, get_y(), left, right); + paint_axis(p, get_visual_y(), left, right); } void DecodeTrace::paint_mid(QPainter &p, int left, int right) { using namespace pv::data::decode; - const double scale = _view->scale(); - assert(scale > 0); - - double samplerate = _decoder_stack->samplerate(); - - _cur_row_headings.clear(); - - // Show sample rate as 1Hz when it is unknown - if (samplerate == 0.0) - samplerate = 1.0; - - const double pixels_offset = (_view->offset() - - _decoder_stack->get_start_time()) / scale; - const double samples_per_pixel = samplerate * scale; - - const uint64_t start_sample = (uint64_t)max((left + pixels_offset) * - samples_per_pixel, 0.0); - const uint64_t end_sample = (uint64_t)max((right + pixels_offset) * - samples_per_pixel, 0.0); - QFontMetrics m(QApplication::font()); - const int text_height = m.boundingRect(QRect(), 0, "Tg").height(); - const int annotation_height = (text_height * 5) / 4; - const int row_height = (text_height * 6) / 4; + _text_height = m.boundingRect(QRect(), 0, "Tg").height(); + _row_height = (_text_height * 6) / 4; + const int annotation_height = (_text_height * 5) / 4; assert(_decoder_stack); const QString err = _decoder_stack->error_message(); if (!err.isEmpty()) { - draw_unresolved_period(p, annotation_height, left, right, - samples_per_pixel, pixels_offset); + draw_unresolved_period(p, annotation_height, left, right); draw_error(p, err, left, right); return; } // Iterate through the rows - assert(_view); - int y = get_y(); + int y = get_visual_y(); + pair sample_range = get_sample_range(left, right); assert(_decoder_stack); - const vector rows(_decoder_stack->get_visible_rows()); + + _visible_rows.clear(); for (size_t i = 0; i < rows.size(); i++) { const Row &row = rows[i]; @@ -212,22 +210,20 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) vector annotations; _decoder_stack->get_annotation_subset(annotations, row, - start_sample, end_sample); + sample_range.first, sample_range.second); if (!annotations.empty()) { - BOOST_FOREACH(const Annotation &a, annotations) + for (const Annotation &a : annotations) draw_annotation(a, p, get_text_colour(), - annotation_height, left, right, - samples_per_pixel, pixels_offset, y, + annotation_height, left, right, y, base_colour); - y += row_height; + y += _row_height; - _cur_row_headings.push_back(row.title()); + _visible_rows.push_back(rows[i]); } } // Draw the hatching - draw_unresolved_period(p, annotation_height, left, right, - samples_per_pixel, pixels_offset); + draw_unresolved_period(p, annotation_height, left, right); } void DecodeTrace::paint_fore(QPainter &p, int left, int right) @@ -236,13 +232,11 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right) (void)right; - QFontMetrics m(QApplication::font()); - const int text_height = m.boundingRect(QRect(), 0, "Tg").height(); - const int row_height = (text_height * 6) / 4; + 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(); + const int y = i * _row_height + get_visual_y(); p.setPen(QPen(Qt::NoPen)); p.setBrush(QApplication::palette().brush(QPalette::WindowText)); @@ -257,9 +251,9 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right) p.drawPolygon(points, countof(points)); } - const QRect r(left + ArrowSize * 2, y - row_height / 2, - right - left, row_height); - const QString h(_cur_row_headings[i]); + const QRect r(left + ArrowSize * 2, y - _row_height / 2, + right - left, _row_height); + const QString h(_visible_rows[i].title()); const int f = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip; @@ -289,7 +283,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) // Add the decoder options _bindings.clear(); - _probe_selectors.clear(); + _channel_selectors.clear(); _decoder_forms.clear(); const list< shared_ptr >& stack = _decoder_stack->stack(); @@ -303,15 +297,14 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) } else { - list< shared_ptr >::const_iterator iter = - stack.begin(); + auto iter = stack.cbegin(); for (int i = 0; i < (int)stack.size(); i++, iter++) { shared_ptr dec(*iter); create_decoder_form(i, dec, parent, form); } form->addRow(new QLabel( - tr("* Required Probes"), parent)); + tr("* Required channels"), parent)); } // Add stacking button @@ -344,10 +337,13 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) } void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, QColor text_color, int h, int left, int right, - double samples_per_pixel, double pixels_offset, int y, + QPainter &p, QColor text_color, int h, int left, int right, int y, size_t base_colour) const { + 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; const double end = a.end_sample() / samples_per_pixel - @@ -373,7 +369,7 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); - const double w = min(p.boundingRect(QRectF(), 0, text).width(), + const double w = min((double)p.boundingRect(QRectF(), 0, text).width(), 0.0) + h; const QRectF rect(x - w / 2, y - h / 2, w, h); @@ -430,7 +426,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, QString best_annotation; int best_width = 0; - BOOST_FOREACH(const QString &a, annotations) { + for (const QString &a : annotations) { const int w = p.boundingRect(QRectF(), 0, a).width(); if (w <= rect.width() && w > best_width) best_annotation = a, best_width = w; @@ -447,7 +443,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, void DecodeTrace::draw_error(QPainter &p, const QString &message, int left, int right) { - const int y = get_y(); + const int y = get_visual_y(); p.setPen(ErrorBgColour.darker()); p.setBrush(ErrorBgColour); @@ -466,11 +462,13 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, } void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, - int right, double samples_per_pixel, double pixels_offset) + int right) const { using namespace pv::data; using pv::data::decode::Decoder; + double samples_per_pixel, pixels_offset; + assert(_decoder_stack); shared_ptr data; @@ -478,12 +476,12 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, const list< shared_ptr > &stack = _decoder_stack->stack(); - // We get the logic data of the first probe in the list. + // We get the logic data of the first channel in the list. // This works because we are currently assuming all // LogicSignals have the same data/snapshot - BOOST_FOREACH (const shared_ptr &dec, stack) - if (dec && !dec->probes().empty() && - ((logic_signal = (*dec->probes().begin()).second)) && + for (const shared_ptr &dec : stack) + if (dec && !dec->channels().empty() && + ((logic_signal = (*dec->channels().begin()).second)) && ((data = logic_signal->logic_data()))) break; @@ -501,7 +499,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, if (sample_count == samples_decoded) return; - const int y = get_y(); + const int y = get_visual_y(); + + 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); const double end = min(sample_count / samples_per_pixel - @@ -517,11 +519,130 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, p.drawRect(no_decode_rect); } +pair DecodeTrace::get_pixels_offset_samples_per_pixel() const +{ + assert(_owner); + assert(_decoder_stack); + + const View *view = _owner->view(); + assert(view); + + 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 make_pair(pixels_offset, samplerate * scale); +} + +pair DecodeTrace::get_sample_range( + int x_start, int x_end) const +{ + 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); +} + +int DecodeTrace::get_row_at_point(const QPoint &point) +{ + if (!_row_height) + return -1; + + const int row = (point.y() - get_visual_y() + _row_height / 2) / + _row_height; + if (row < 0 || row >= (int)_visible_rows.size()) + return -1; + + return row; +} + +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_visual_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, shared_ptr &dec, QWidget *parent, QFormLayout *form) { - const GSList *probe; + const GSList *l; assert(dec); const srd_decoder *const decoder = dec->decoder(); @@ -542,34 +663,34 @@ void DecodeTrace::create_decoder_form(int index, QFormLayout *const decoder_form = new QFormLayout; group->add_layout(decoder_form); - // Add the mandatory probes - for(probe = decoder->probes; probe; probe = probe->next) { - const struct srd_probe *const p = - (struct srd_probe *)probe->data; - QComboBox *const combo = create_probe_selector(parent, dec, p); + // Add the mandatory channels + for(l = decoder->channels; l; l = l->next) { + const struct srd_channel *const pdch = + (struct srd_channel *)l->data; + QComboBox *const combo = create_channel_selector(parent, dec, pdch); connect(combo, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_probe_selected(int))); + this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2) *") - .arg(QString::fromUtf8(p->name)) - .arg(QString::fromUtf8(p->desc)), combo); + .arg(QString::fromUtf8(pdch->name)) + .arg(QString::fromUtf8(pdch->desc)), combo); - const ProbeSelector s = {combo, dec, p}; - _probe_selectors.push_back(s); + const ChannelSelector s = {combo, dec, pdch}; + _channel_selectors.push_back(s); } - // Add the optional probes - for(probe = decoder->opt_probes; probe; probe = probe->next) { - const struct srd_probe *const p = - (struct srd_probe *)probe->data; - QComboBox *const combo = create_probe_selector(parent, dec, p); + // Add the optional channels + for(l = decoder->opt_channels; l; l = l->next) { + const struct srd_channel *const pdch = + (struct srd_channel *)l->data; + QComboBox *const combo = create_channel_selector(parent, dec, pdch); connect(combo, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_probe_selected(int))); + this, SLOT(on_channel_selected(int))); decoder_form->addRow(tr("%1 (%2)") - .arg(QString::fromUtf8(p->name)) - .arg(QString::fromUtf8(p->desc)), combo); + .arg(QString::fromUtf8(pdch->name)) + .arg(QString::fromUtf8(pdch->desc)), combo); - const ProbeSelector s = {combo, dec, p}; - _probe_selectors.push_back(s); + const ChannelSelector s = {combo, dec, pdch}; + _channel_selectors.push_back(s); } // Add the options @@ -583,24 +704,23 @@ void DecodeTrace::create_decoder_form(int index, _decoder_forms.push_back(group); } -QComboBox* DecodeTrace::create_probe_selector( +QComboBox* DecodeTrace::create_channel_selector( QWidget *parent, const shared_ptr &dec, - const srd_probe *const probe) + const srd_channel *const pdch) { 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 map >::const_iterator probe_iter = - dec->probes().find(probe); + const auto channel_iter = dec->channels().find(pdch); QComboBox *selector = new QComboBox(parent); selector->addItem("-", qVariantFromValue((void*)NULL)); - if (probe_iter == dec->probes().end()) + if (channel_iter == dec->channels().end()) selector->setCurrentIndex(0); for(size_t i = 0; i < sigs.size(); i++) { @@ -609,9 +729,9 @@ QComboBox* DecodeTrace::create_probe_selector( if (dynamic_pointer_cast(s) && s->enabled()) { - selector->addItem(s->get_name(), + selector->addItem(s->name(), qVariantFromValue((void*)s.get())); - if ((*probe_iter).second == s) + if ((*channel_iter).second == s) selector->setCurrentIndex(i + 1); } } @@ -619,14 +739,16 @@ QComboBox* DecodeTrace::create_probe_selector( return selector; } -void DecodeTrace::commit_decoder_probes(shared_ptr &dec) +void DecodeTrace::commit_decoder_channels(shared_ptr &dec) { assert(dec); - map > probe_map; - const vector< shared_ptr > sigs = _session.get_signals(); + map > channel_map; + + shared_lock lock(_session.signals_mutex()); + const vector< shared_ptr > &sigs(_session.signals()); - BOOST_FOREACH(const ProbeSelector &s, _probe_selectors) + for (const ChannelSelector &s : _channel_selectors) { if(s._decoder != dec) break; @@ -635,31 +757,30 @@ void DecodeTrace::commit_decoder_probes(shared_ptr &dec) (LogicSignal*)s._combo->itemData( s._combo->currentIndex()).value(); - BOOST_FOREACH(shared_ptr sig, sigs) + for (shared_ptr sig : sigs) if(sig.get() == selection) { - probe_map[s._probe] = + channel_map[s._pdch] = dynamic_pointer_cast(sig); break; } } - dec->set_probes(probe_map); + dec->set_channels(channel_map); } -void DecodeTrace::commit_probes() +void DecodeTrace::commit_channels() { assert(_decoder_stack); - BOOST_FOREACH(shared_ptr dec, - _decoder_stack->stack()) - commit_decoder_probes(dec); + for (shared_ptr dec : _decoder_stack->stack()) + commit_decoder_channels(dec); _decoder_stack->begin_decode(); } void DecodeTrace::on_new_decode_data() { - if (_view) - _view->update_viewport(); + if (_owner) + _owner->update_viewport(); } void DecodeTrace::delete_pressed() @@ -672,9 +793,9 @@ void DecodeTrace::on_delete() _session.remove_decode_signal(this); } -void DecodeTrace::on_probe_selected(int) +void DecodeTrace::on_channel_selected(int) { - commit_probes(); + commit_channels(); } void DecodeTrace::on_stack_decoder(srd_decoder *decoder) @@ -705,7 +826,7 @@ void DecodeTrace::on_show_hide_decoder(int index) const list< shared_ptr > stack(_decoder_stack->stack()); // Find the decoder in the stack - list< shared_ptr >::const_iterator iter = stack.begin(); + auto iter = stack.cbegin(); for(int i = 0; i < index; i++, iter++) assert(iter != stack.end()); @@ -718,7 +839,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