X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=be2dadf11a0023a5cc1bce1204b71ad1a7a43d8f;hp=6f14732d2bddc56a9b71ed6bf24af6cd15447d79;hb=0ce3d18c04b989eeae55d5a82d133a2d154ad6c1;hpb=1df18f6b6d20abd3f1ede94325b6781bf5038ea9 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 6f14732d..be2dadf1 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -45,7 +45,7 @@ extern "C" { #include #include #include -#include +#include #include #include #include @@ -129,7 +129,6 @@ DecodeTrace::DecodeTrace(pv::Session &session, 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) @@ -160,23 +159,23 @@ pair DecodeTrace::v_extents() const { /// @todo Replace this with an implementation that knows the true /// height of the trace - const int row_height = (RowItemPaintParams::text_height() * 6) / 4; + const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; return make_pair(-row_height / 2, row_height * 7 / 2); } -void DecodeTrace::paint_back(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); } -void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - text_height_ = RowItemPaintParams::text_height(); - row_height_ = (text_height_ * 6) / 4; - const int annotation_height = (text_height_ * 5) / 4; + const int text_height = ViewItemPaintParams::text_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(); @@ -212,8 +211,8 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) sample_range.first, sample_range.second); if (!annotations.empty()) { for (const Annotation &a : annotations) - draw_annotation(a, p, get_text_colour(), - annotation_height, pp, y, base_colour); + draw_annotation(a, p, annotation_height, + pp, y, base_colour); y += row_height_; visible_rows_.push_back(rows[i]); @@ -224,7 +223,7 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp) draw_unresolved_period(p, annotation_height, pp.left(), pp.right()); } -void DecodeTrace::paint_fore(QPainter &p, const RowItemPaintParams &pp) +void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; @@ -333,7 +332,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) } void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, QColor text_color, int h, const RowItemPaintParams &pp, int y, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, size_t base_colour) const { double samples_per_pixel, pixels_offset; @@ -353,15 +352,13 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, text_color, h, - start, y); + draw_instant(a, p, fill, outline, h, start, y); else - draw_range(a, p, fill, outline, text_color, h, - start, end, y); + draw_range(a, p, fill, outline, h, start, end, y); } void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, QColor text_color, int h, double x, int y) const + QColor fill, QColor outline, int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -373,12 +370,12 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & p.setBrush(fill); p.drawRoundedRect(rect, h / 2, h / 2); - p.setPen(text_color); + p.setPen(Qt::black); p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text); } void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, QColor text_color, int h, double start, + QColor fill, QColor outline, int h, double start, double end, int y) const { const double top = y + .5 - h / 2; @@ -416,7 +413,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, if (rect.width() <= 4) return; - p.setPen(text_color); + p.setPen(Qt::black); // Try to find an annotation that will fit QString best_annotation; @@ -437,7 +434,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, } void DecodeTrace::draw_error(QPainter &p, const QString &message, - const RowItemPaintParams &pp) + const ViewItemPaintParams &pp) { const int y = get_visual_y(); @@ -453,7 +450,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r, Qt::AbsoluteSize); - p.setPen(get_text_colour()); + p.setPen(Qt::black); p.drawText(text_rect, message); } @@ -474,20 +471,20 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, // 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 + // LogicSignals have the same data/segment for (const shared_ptr &dec : stack) if (dec && !dec->channels().empty() && ((logic_signal = (*dec->channels().begin()).second)) && ((data = logic_signal->logic_data()))) break; - if (!data || data->logic_snapshots().empty()) + if (!data || data->logic_segments().empty()) return; - const shared_ptr snapshot = - data->logic_snapshots().front(); - assert(snapshot); - const int64_t sample_count = (int64_t)snapshot->get_sample_count(); + const shared_ptr segment = + data->logic_segments().front(); + assert(segment); + const int64_t sample_count = (int64_t)segment->get_sample_count(); if (sample_count == 0) return; @@ -527,7 +524,7 @@ pair DecodeTrace::get_pixels_offset_samples_per_pixel() const assert(scale > 0); const double pixels_offset = - (view->offset() - decoder_stack_->get_start_time()) / scale; + (view->offset() - decoder_stack_->start_time()) / scale; double samplerate = decoder_stack_->samplerate(); @@ -558,9 +555,15 @@ 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()) + const int y = (point.y() - get_visual_y() + row_height_ / 2); + + /* Integer divison of (x-1)/x would yield 0, so we check for this. */ + if (y < 0) + return -1; + + const int row = y / row_height_; + + if (row >= (int)visible_rows_.size()) return -1; return row; @@ -589,11 +592,6 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) QString() : annotations[0].annotations().front(); } -void DecodeTrace::hide_hover_annotation() -{ - QToolTip::hideText(); -} - void DecodeTrace::hover_point_changed() { assert(owner_); @@ -607,7 +605,7 @@ void DecodeTrace::hover_point_changed() assert(view); if (!row_height_ || ann.isEmpty()) { - hide_hover_annotation(); + QToolTip::hideText(); return; } @@ -628,7 +626,7 @@ void DecodeTrace::hover_point_changed() hp.setY(get_visual_y() - (row_height_ / 2) + (hover_row * row_height_) - - row_height_ - text_size.height()); + row_height_ - text_size.height() - padding); QToolTip::showText(view->viewport()->mapToGlobal(hp), ann); } @@ -775,7 +773,7 @@ void DecodeTrace::commit_channels() void DecodeTrace::on_new_decode_data() { if (owner_) - owner_->appearance_changed(false, true); + owner_->row_item_appearance_changed(false, true); } void DecodeTrace::delete_pressed() @@ -835,7 +833,7 @@ void DecodeTrace::on_show_hide_decoder(int index) decoder_forms_[index]->set_decoder_visible(show); if (owner_) - owner_->appearance_changed(false, true); + owner_->row_item_appearance_changed(false, true); } } // namespace view