X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=19decfd4928420f484cf213c8329f0899dd068cd;hp=6f00a451fba062abfc9ccf13bc3c464f1ce0ac69;hb=d6128866e740f496a1bb3c9636e188648507fc3a;hpb=aee9dcf34d3bb5bf53803d3e132ae69475e434b7

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 6f00a451..19decfd4 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -44,6 +44,7 @@ extern "C" {
 #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>
@@ -199,9 +200,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	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 {
@@ -229,7 +228,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 			y += row_height_;
 
-			visible_rows_.push_back(rows[i]);
+			visible_rows_.push_back(row);
 		}
 	}
 
@@ -431,16 +430,16 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 		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);
 }
 
@@ -483,7 +482,7 @@ void DecodeTrace::draw_annotation_block(
 }
 
 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();
@@ -491,8 +490,6 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 		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);
@@ -500,16 +497,13 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 }
 
 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));
@@ -798,8 +792,8 @@ void DecodeTrace::create_decoder_form(int index,
 		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);
@@ -813,8 +807,8 @@ void DecodeTrace::create_decoder_form(int index,
 		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);
@@ -842,7 +836,8 @@ QComboBox* DecodeTrace::create_channel_selector(
 	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);