namespace views {
namespace trace {
-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
// 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;
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";
r.expand_marker_highlighted = false;
if (hover_row) {
- int row_y = get_row_y(hover_row);
+ const pair<int, int> 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;
void DecodeTrace::draw_annotations(deque<const Annotation*>& 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;
}
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;
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;
const double pixels_offset =
((view->offset() - decode_signal_->start_time()) / scale).convert_to<double>();
- double samplerate = decode_signal_->samplerate();
+ double samplerate = decode_signal_->get_samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
decode_signal_->get_annotation_subset(annotations, r->decode_row,
current_segment_, sample_range.first, sample_range.second);
- return (annotations.empty()) ?
- QString() : annotations[0]->annotations()->front();
+ const Annotation* a = annotations.empty() ? nullptr : annotations[0];
+
+ // Create a string of the format "CLASS: VALUE"
+ QString s;
+ if (a) {
+ if (!a->ann_class_description().isEmpty())
+ s = a->ann_class_description() + ": ";
+ s += a->annotations()->front();
+ }
+
+ return s;
}
void DecodeTrace::create_decoder_form(int index, shared_ptr<Decoder> &dec,
QComboBox *selector = new QComboBox(parent);
- selector->addItem("-", qVariantFromValue((void*)nullptr));
+ selector->addItem("-", QVariant::fromValue((void*)nullptr));
if (!ch->assigned_signal)
selector->setCurrentIndex(0);
for (const shared_ptr<data::SignalBase> &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);
}
}
{
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);
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);
{
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()
QComboBox *cb = qobject_cast<QComboBox*>(QObject::sender());
// Determine signal that was selected
- const data::SignalBase *signal =
- (data::SignalBase*)cb->itemData(cb->currentIndex()).value<void*>();
+ shared_ptr<data::SignalBase> signal =
+ cb->itemData(cb->currentIndex()).value<shared_ptr<data::SignalBase>>();
// Determine decode channel ID this combo box is the channel selector for
const uint16_t id = channel_id_map_.at(cb);
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<void*>();
assert(row_ptr);