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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index b2ead1a6..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 (auto i : rows) {
-		const Row &row = 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(i);
+			visible_rows_.push_back(row);
 		}
 	}
 
@@ -793,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);
@@ -808,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);
@@ -837,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);