X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=5b9b3f36c586568111684bfbfc73fd491b1a208e;hb=cf1541a18fcd007c9965a3199b9c4f917856b292;hp=1cc89feb67ae46af816a036b26d97e55d9a3ec87;hpb=a767229eb18acbd70af38bb660c8ebd1bbd82e73;p=pulseview.git diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 1cc89feb..5b9b3f36 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -82,10 +82,6 @@ namespace pv { namespace views { namespace trace { -#define DECODETRACE_COLOR_SATURATION (180) /* 0-255 */ -#define DECODETRACE_COLOR_VALUE (170) /* 0-255 */ - -const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29); const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85); const QColor DecodeTrace::ExpandMarkerWarnColor = QColor(0xFF, 0xA5, 0x00); // QColorConstants::Svg::orange const QColor DecodeTrace::ExpandMarkerHiddenColor = QColor(0x69, 0x69, 0x69); // QColorConstants::Svg::dimgray @@ -164,7 +160,8 @@ DecodeTrace::DecodeTrace(pv::Session &session, // Determine shortest string we want to see displayed in full QFontMetrics m(QApplication::font()); - min_useful_label_width_ = m.width("XX"); // e.g. two hex characters + // e.g. two hex characters + min_useful_label_width_ = util::text_width(m, "XX"); default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4; annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4; @@ -175,11 +172,14 @@ DecodeTrace::DecodeTrace(pv::Session &session, // Note: The offset equals the color of the first annotation QColor color; const int h = (120 + 160 * index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; + const int s = DECODE_COLOR_SATURATION; + const int v = DECODE_COLOR_VALUE; color.setHsv(h, s, v); base_->set_color(color); + connect(decode_signal_.get(), SIGNAL(color_changed(QColor)), + this, SLOT(on_color_changed(QColor))); + connect(decode_signal_.get(), SIGNAL(new_annotations()), this, SLOT(on_new_annotations())); connect(decode_signal_.get(), SIGNAL(decode_reset()), @@ -336,9 +336,9 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) owner_->row_item_appearance_changed(false, true); } - const QString err = decode_signal_->error_message(); + const QString err = base_->get_error_message(); if (!err.isEmpty()) - draw_error(p, err, pp); + paint_error(p, pp); #if DECODETRACE_SHOW_RENDER_TIME qDebug() << "Rendering" << base_->name() << "took" << render_time_.elapsed() << "ms"; @@ -612,9 +612,12 @@ void DecodeTrace::hover_point_changed(const QPoint &hp) r.expand_marker_highlighted = false; if (hover_row) { - int row_y = get_row_y(hover_row); + const pair extents = v_extents(); + const int trace_top = get_visual_y() + extents.first; + const int trace_btm = get_visual_y() + extents.second; + if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) && - (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) { + (hp.y() > trace_top) && (hp.y() < trace_btm)) { hover_row->expand_marker_highlighted = true; show_hidden_rows_ = true; @@ -697,7 +700,7 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) void DecodeTrace::draw_annotations(deque& annotations, QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) { - Annotation::Class block_class = 0; + uint32_t block_class = 0; bool block_class_uniform = true; qreal block_start = 0; int block_ann_count = 0; @@ -789,8 +792,8 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, const double start = a->start_sample() / samples_per_pixel - pixels_offset; const double end = a->end_sample() / samples_per_pixel - pixels_offset; - p.setPen(row.ann_class_dark_color.at(a->ann_class_id())); - p.setBrush(row.ann_class_color.at(a->ann_class_id())); + p.setPen(a->dark_color()); + p.setBrush(a->color()); if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding))) return; @@ -802,7 +805,7 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, } void DecodeTrace::draw_annotation_block(qreal start, qreal end, - Annotation::Class ann_class, bool use_ann_format, QPainter &p, int y, + uint32_t ann_class, bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const { const double top = y + .5 - annotation_height_ / 2; @@ -813,8 +816,8 @@ void DecodeTrace::draw_annotation_block(qreal start, qreal end, // one format that all of these annotations have. Otherwise, we should use // a neutral color (i.e. gray) if (use_ann_format) { - p.setPen(row.ann_class_dark_color.at(ann_class)); - p.setBrush(QBrush(row.ann_class_color.at(ann_class), Qt::Dense4Pattern)); + p.setPen(row.decode_row->get_dark_class_color(ann_class)); + p.setBrush(QBrush(row.decode_row->get_class_color(ann_class), Qt::Dense4Pattern)); } else { p.setPen(QColor(Qt::darkGray)); p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern)); @@ -904,28 +907,6 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, best_annotation, Qt::ElideRight, rect.width())); } -void DecodeTrace::draw_error(QPainter &p, const QString &message, - const ViewItemPaintParams &pp) -{ - const int y = get_visual_y(); - - double samples_per_pixel, pixels_offset; - tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); - - p.setPen(ErrorBgColor.darker()); - p.setBrush(ErrorBgColor); - - const QRectF bounding_rect = QRectF(pp.left(), INT_MIN / 2 + y, pp.right(), INT_MAX); - - const QRectF text_rect = p.boundingRect(bounding_rect, Qt::AlignCenter, message); - const qreal r = text_rect.height() / 4; - - p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r, Qt::AbsoluteSize); - - p.setPen(Qt::black); - p.drawText(text_rect, message); -} - void DecodeTrace::draw_unresolved_period(QPainter &p, int left, int right) const { double samples_per_pixel, pixels_offset; @@ -971,7 +952,7 @@ pair DecodeTrace::get_pixels_offset_samples_per_pixel() const const double pixels_offset = ((view->offset() - decode_signal_->start_time()) / scale).convert_to(); - double samplerate = decode_signal_->samplerate(); + double samplerate = decode_signal_->get_samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) @@ -995,34 +976,6 @@ pair DecodeTrace::get_view_sample_range( return make_pair(start, end); } -QColor DecodeTrace::get_row_color(int row_index) const -{ - // For each row color, use the base color hue and add an offset that's - // not a dividend of 360 - - QColor color; - const int h = (base_->color().toHsv().hue() + 20 * row_index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; - color.setHsl(h, s, v); - - return color; -} - -QColor DecodeTrace::get_annotation_color(QColor row_color, int annotation_index) const -{ - // For each row color, use the base color hue and add an offset that's - // not a dividend of 360 and not a multiple of the row offset - - QColor color(row_color); - const int h = (color.toHsv().hue() + 55 * annotation_index) % 360; - const int s = DECODETRACE_COLOR_SATURATION; - const int v = DECODETRACE_COLOR_VALUE; - color.setHsl(h, s, v); - - return color; -} - unsigned int DecodeTrace::get_row_y(const DecodeTraceRow* row) const { assert(row); @@ -1170,7 +1123,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha QComboBox *selector = new QComboBox(parent); - selector->addItem("-", qVariantFromValue((void*)nullptr)); + selector->addItem("-", QVariant::fromValue((void*)nullptr)); if (!ch->assigned_signal) selector->setCurrentIndex(0); @@ -1178,10 +1131,9 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha for (const shared_ptr &b : sig_list) { assert(b); if (b->logic_data() && b->enabled()) { - selector->addItem(b->name(), - qVariantFromValue((void*)b.get())); + selector->addItem(b->name(), QVariant::fromValue(b)); - if (ch->assigned_signal == b.get()) + if (ch->assigned_signal == b) selector->setCurrentIndex(selector->count() - 1); } } @@ -1194,9 +1146,9 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent, { QComboBox *selector = new QComboBox(parent); - selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW)); - selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH)); - selector->addItem("X", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0)); + selector->addItem("0", QVariant::fromValue((int)SRD_INITIAL_PIN_LOW)); + selector->addItem("1", QVariant::fromValue((int)SRD_INITIAL_PIN_HIGH)); + selector->addItem("X", QVariant::fromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0)); selector->setCurrentIndex(ch->initial_pin_state); @@ -1368,11 +1320,11 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) for (const AnnotationClass* ann_class : ann_classes) { cb = new QCheckBox(); cb->setText(tr(ann_class->description)); - cb->setChecked(ann_class->visible); + cb->setChecked(ann_class->visible()); int dim = ViewItemPaintParams::text_height() - 2; QPixmap pixmap(dim, dim); - pixmap.fill(r->ann_class_color[ann_class->id]); + pixmap.fill(r->decode_row->get_class_color(ann_class->id)); cb->setIcon(pixmap); r->selector_container->layout()->addWidget(cb); @@ -1408,6 +1360,7 @@ void DecodeTrace::update_rows() // Row doesn't exist yet, create and append it DecodeTraceRow nr; nr.decode_row = decode_row; + nr.decode_row->set_base_color(base_->color()); nr.height = default_row_height_; nr.expanded_height = default_row_height_; nr.currently_visible = false; @@ -1421,16 +1374,6 @@ void DecodeTrace::update_rows() nr.header_container = new QWidget(nr.container); nr.selector_container = new QWidget(nr.container); - nr.row_color = get_row_color(decode_row->index()); - - vector ann_classes = decode_row->ann_classes(); - for (const AnnotationClass* ann_class : ann_classes) { - nr.ann_class_color[ann_class->id] = - get_annotation_color(nr.row_color, ann_class->id); - nr.ann_class_dark_color[ann_class->id] = - nr.ann_class_color[ann_class->id].darker(); - } - rows_.push_back(nr); r = &rows_.back(); initialize_row_widgets(r, row_id); @@ -1526,6 +1469,15 @@ void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value) always_show_all_rows_ = value.toBool(); } +void DecodeTrace::on_color_changed(const QColor &color) +{ + for (DecodeTraceRow& r : rows_) + r.decode_row->set_base_color(color); + + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + void DecodeTrace::on_new_annotations() { if (!delayed_trace_updater_.isActive()) @@ -1570,8 +1522,8 @@ void DecodeTrace::on_channel_selected(int) QComboBox *cb = qobject_cast(QObject::sender()); // Determine signal that was selected - const data::SignalBase *signal = - (data::SignalBase*)cb->itemData(cb->currentIndex()).value(); + shared_ptr signal = + cb->itemData(cb->currentIndex()).value>(); // Determine decode channel ID this combo box is the channel selector for const uint16_t id = channel_id_map_.at(cb); @@ -1649,7 +1601,7 @@ void DecodeTrace::on_show_hide_class(QWidget* sender) assert(ann_class_ptr); AnnotationClass* ann_class = (AnnotationClass*)ann_class_ptr; - ann_class->visible = !ann_class->visible; + ann_class->set_visible(!ann_class->visible()); void* row_ptr = sender->property("decode_trace_row_ptr").value(); assert(row_ptr);