X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=da160e4b1ab9c3af7083286ff4529f06603ddd11;hp=8dea88321a7c642cf25dc447843fad403856ab60;hb=e06cf18db72;hpb=9ba13f5e933f55f015e7c592980dfad14b4c66a8

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 8dea8832..da160e4b 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -406,7 +406,7 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 		pixels_offset;
 	const double end = a.end_sample() / samples_per_pixel - pixels_offset;
 
-	QColor color = get_annotation_color(row_color, a.format());
+	QColor color = get_annotation_color(row_color, a.ann_class());
 	p.setPen(color.darker());
 	p.setBrush(color);
 
@@ -440,14 +440,14 @@ void DecodeTrace::draw_annotation_block(
 	const double top = y + .5 - h / 2;
 	const double bottom = y + .5 + h / 2;
 
-	QColor color = get_annotation_color(row_color, annotations.front().format());
+	QColor color = get_annotation_color(row_color, annotations.front().ann_class());
 
 	// Check if all annotations are of the same type (i.e. we can use one color)
 	// or if we should use a neutral color (i.e. gray)
-	const int format = annotations.front().format();
-	const bool single_format = all_of(
+	const Annotation::Class ann_class = annotations.front().ann_class();
+	const bool single_class = all_of(
 		annotations.begin(), annotations.end(),
-		[&](const Annotation &a) { return a.format() == format; });
+		[&](const Annotation &a) { return a.ann_class() == ann_class; });
 
 	const QRectF rect(start, top, end - start, bottom - top);
 	const int r = h / 4;
@@ -456,8 +456,8 @@ void DecodeTrace::draw_annotation_block(
 	p.setBrush(Qt::white);
 	p.drawRoundedRect(rect, r, r);
 
-	p.setPen((single_format ? color.darker() : Qt::gray));
-	p.setBrush(QBrush((single_format ? color : Qt::gray), Qt::Dense4Pattern));
+	p.setPen((single_class ? color.darker() : Qt::gray));
+	p.setBrush(QBrush((single_class ? color : Qt::gray), Qt::Dense4Pattern));
 	p.drawRoundedRect(rect, r, r);
 }
 
@@ -581,7 +581,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 		samples_per_pixel - pixels_offset, left - 1.0);
 	const double end = min(sample_count / samples_per_pixel -
 		pixels_offset, right + 1.0);
-	const QRectF no_decode_rect(start, y - (h / 2) + 0.5, end - start, h);
+	const QRectF no_decode_rect(start, y - (h / 2) - 0.5, end - start, h);
 
 	p.setPen(QPen(Qt::NoPen));
 	p.setBrush(Qt::white);