#include "decodetrace.hpp"
#include <pv/session.hpp>
+#include <pv/strnatcmp.hpp>
#include <pv/data/decoderstack.hpp>
#include <pv/data/decode/decoder.hpp>
#include <pv/data/logic.hpp>
{
assert(decoder_stack_);
+ // 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
+
set_colour(DecodeColours[index % countof(DecodeColours)]);
connect(decoder_stack_.get(), SIGNAL(new_decode_data()),
{
const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
- return make_pair(-row_height, row_height * max_visible_rows_);
+ // Make an empty decode trace appear symmetrical
+ const int row_count = max(1, max_visible_rows_);
+
+ return make_pair(-row_height, row_height * row_count);
}
void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
return;
}
+ // Set default pen to allow for text width calculation
+ p.setPen(Qt::black);
+
// Iterate through the rows
int y = get_visual_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(
const vector<Row> rows(decoder_stack_->get_visible_rows());
visible_rows_.clear();
- for (size_t i = 0; i < rows.size(); i++) {
- const Row &row = rows[i];
-
+ for (const Row& row : rows) {
// Cache the row title widths
int row_title_width;
try {
y += row_height_;
- visible_rows_.push_back(rows[i]);
+ visible_rows_.push_back(row);
}
}
// Draw the hatching
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
+ if ((int)visible_rows_.size() > max_visible_rows_)
+ owner_->extents_changed(false, true);
+
// Update the maximum row count if needed
max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
}
bool a_is_separate = false;
// Annotation wider than the threshold for a useful label width?
- if (a_width > 20) {
+ if (a_width >= min_useful_label_width_) {
for (const QString &ann_text : a.annotations()) {
const int w = p.boundingRect(QRectF(), 0, ann_text).width();
// Annotation wide enough to fit a label? Don't put it in a block then
pixels_offset;
const size_t colour = (base_colour + a.format()) % countof(Colours);
- const QColor &fill = Colours[colour];
- const QColor &outline = OutlineColours[colour];
+ p.setPen(OutlineColours[colour]);
+ p.setBrush(Colours[colour]);
if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding)
return;
if (a.start_sample() == a.end_sample())
- draw_instant(a, p, fill, outline, h, start, y);
+ draw_instant(a, p, h, start, y);
else
- draw_range(a, p, fill, outline, h, start, end, y, pp,
+ draw_range(a, p, h, start, end, y, pp,
row_title_width);
}
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, int h, double x, int y) const
+ int h, double x, int y) const
{
const QString text = a.annotations().empty() ?
QString() : a.annotations().back();
0.0) + h;
const QRectF rect(x - w / 2, y - h / 2, w, h);
- p.setPen(outline);
- p.setBrush(fill);
p.drawRoundedRect(rect, h / 2, h / 2);
p.setPen(Qt::black);
}
void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, int h, double start,
- double end, int y, const ViewItemPaintParams &pp, int row_title_width) const
+ int h, double start, double end, int y, const ViewItemPaintParams &pp,
+ int row_title_width) const
{
const double top = y + .5 - h / 2;
const double bottom = y + .5 + h / 2;
const vector<QString> annotations = a.annotations();
- p.setPen(outline);
- p.setBrush(fill);
-
// If the two ends are within 1 pixel, draw a vertical line
if (start + 1.0 > end) {
p.drawLine(QPointF(start, top), QPointF(start, bottom));
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%2) *")
- .arg(QString::fromUtf8(pdch->name))
- .arg(QString::fromUtf8(pdch->desc)), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
const ChannelSelector s = {combo, dec, pdch};
channel_selectors_.push_back(s);
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%2)")
- .arg(QString::fromUtf8(pdch->name))
- .arg(QString::fromUtf8(pdch->desc)), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
const ChannelSelector s = {combo, dec, pdch};
channel_selectors_.push_back(s);
vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
std::sort(sig_list.begin(), sig_list.end(),
[](const shared_ptr<Signal> &a, const shared_ptr<Signal> b) {
- return a->name().compare(b->name()) < 0; });
+ return strnatcasecmp(a->name().toStdString(),
+ b->name().toStdString()) < 0; });
assert(decoder_stack_);
const auto channel_iter = dec->channels().find(pdch);