X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=ae2ec16287b561e775b595e35a622ab17e105fbd;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=61653658e47182eeb86fe236f50acb0e74ddbb3a;hpb=ef40ad83ac7e2cb12b4ecfede4564ba3ef416905;p=pulseview.git diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 61653658..ae2ec162 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -24,6 +24,8 @@ extern "C" { #include +#include + #include #include @@ -33,6 +35,7 @@ extern "C" { #include #include #include +#include #include "decodetrace.h" @@ -44,15 +47,19 @@ extern "C" { #include #include #include +#include #include #include using std::dynamic_pointer_cast; using std::list; +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 { @@ -143,12 +150,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); @@ -159,26 +160,6 @@ 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()); _text_height = m.boundingRect(QRect(), 0, "Tg").height(); _row_height = (_text_height * 6) / 4; @@ -188,19 +169,19 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) 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(); + 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]; @@ -213,22 +194,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()) { 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; - _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) @@ -239,7 +218,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(); @@ -258,7 +237,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; @@ -342,10 +321,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 - @@ -464,11 +446,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; @@ -500,6 +484,10 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, return; const int y = get_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 - @@ -515,6 +503,115 @@ 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(_view); + assert(_decoder_stack); + + 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_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() +{ + 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, shared_ptr &dec, QWidget *parent, QFormLayout *form) @@ -605,7 +702,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);