X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=d9b4691b310e883816a4bfd373cf93644608708a;hp=d826587e507fbcbf03464cc8292700bf5b44ea3e;hb=1e948182f3f9353bd74875a37cacc833312a8c8e;hpb=38b77a3ba1738aebf516491cc95e25219938a877 diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index d826587e..d9b4691b 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -82,9 +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 @@ -150,7 +147,6 @@ DecodeTrace::DecodeTrace(pv::Session &session, shared_ptr signalbase, int index) : Trace(signalbase), session_(session), - max_visible_rows_(0), show_hidden_rows_(false), delete_mapper_(this), show_hide_mapper_(this), @@ -176,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()), @@ -276,6 +275,7 @@ void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp) void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) { lock_guard lock(row_modification_mutex_); + unsigned int visible_rows; #if DECODETRACE_SHOW_RENDER_TIME render_time_.restart(); @@ -292,7 +292,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) sample_range.second = min((int64_t)sample_range.second, decode_signal_->get_decoded_sample_count(current_segment_, false)); - visible_rows_ = 0; + visible_rows = 0; int y = get_visual_y(); for (DecodeTraceRow& r : rows_) { @@ -322,14 +322,14 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) if (r.currently_visible) { draw_annotations(annotations, p, pp, y, r); y += r.height; - visible_rows_++; + visible_rows++; } } draw_unresolved_period(p, pp.left(), pp.right()); - if (visible_rows_ > max_visible_rows_) { - max_visible_rows_ = visible_rows_; + if (visible_rows != visible_rows_) { + visible_rows_ = visible_rows; // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -697,7 +697,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 +789,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 +802,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 +813,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)); @@ -971,7 +971,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 +995,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 +1142,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); @@ -1179,7 +1151,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha assert(b); if (b->logic_data() && b->enabled()) { selector->addItem(b->name(), - qVariantFromValue((void*)b.get())); + QVariant::fromValue((void*)b.get())); if (ch->assigned_signal == b.get()) selector->setCurrentIndex(selector->count() - 1); @@ -1194,9 +1166,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 +1340,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 +1380,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 +1394,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); @@ -1481,8 +1444,6 @@ void DecodeTrace::set_row_expanded(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) @@ -1495,8 +1456,6 @@ void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::update_expanded_rows() @@ -1526,10 +1485,17 @@ void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value) { Trace::on_setting_changed(key, value); - if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) { - max_visible_rows_ = 0; + if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) 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() @@ -1546,7 +1512,6 @@ void DecodeTrace::on_delayed_trace_update() void DecodeTrace::on_decode_reset() { - max_visible_rows_ = 0; update_rows(); if (owner_) @@ -1618,8 +1583,6 @@ void DecodeTrace::on_delete_decoder(int index) decode_signal_->remove_decoder(index); update_rows(); - // Force re-calculation of the trace height - max_visible_rows_ = 0; owner_->extents_changed(false, true); create_popup_form(); @@ -1632,11 +1595,8 @@ void DecodeTrace::on_show_hide_decoder(int index) assert(index < (int)decoder_forms_.size()); decoder_forms_[index]->set_decoder_visible(state); - if (!state) { - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; + if (!state) owner_->extents_changed(false, true); - } owner_->row_item_appearance_changed(false, true); } @@ -1651,8 +1611,6 @@ void DecodeTrace::on_show_hide_row(int row_id) if (!rows_[row_id].decode_row->visible()) set_row_collapsed(&rows_[row_id]); - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); } @@ -1663,7 +1621,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); @@ -1834,7 +1792,7 @@ void DecodeTrace::on_animation_timer() if (r.expanding) { if (r.height < r.expanded_height) { r.anim_height += height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = min((int)r.anim_height, (int)r.expanded_height); r.anim_shape += ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1844,7 +1802,7 @@ void DecodeTrace::on_animation_timer() if (r.collapsing) { if (r.height > default_row_height_) { r.anim_height -= height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = max((int)r.anim_height, (int)0); r.anim_shape -= ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1879,8 +1837,6 @@ void DecodeTrace::on_hide_hidden_rows() if (!any_highlighted) { show_hidden_rows_ = false; - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); }