X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;fp=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=b502395c3dd907a8d0d2c2f89b07458cc3547d6c;hp=66fabf5ac1534817781ebe07a453bbdbc2bedaad;hb=d656b01007629b239b51ab34e5a0219ef4f2595a;hpb=ca9a5918dee795c566d0caaff096f791dba92f66

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index 66fabf5a..b502395c 100644
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -22,6 +22,8 @@
 
 #include "pv/views/tabular_decoder/view.hpp"
 
+#include "view.hpp"
+
 using std::make_shared;
 
 namespace pv {
@@ -31,6 +33,7 @@ namespace tabular_decoder {
 AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 	QAbstractTableModel(parent),
 	all_annotations_(nullptr),
+	signal_(nullptr),
 	prev_segment_(0),
 	prev_last_row_(0)
 {
@@ -48,7 +51,7 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 
 QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) const
 {
-	if (!index.isValid())
+	if (!index.isValid() || !signal_)
 		return QVariant();
 
 	const Annotation* ann =
@@ -67,10 +70,18 @@ QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) con
 	}
 
 	if (role == Qt::BackgroundRole) {
-		if (theme_is_dark_)
-			return QBrush(ann->dark_color());
-		else
-			return QBrush(ann->bright_color());
+		int level = 0;
+
+		const unsigned int ann_stack_level = ann->row_data()->row()->decoder()->get_stack_level();
+		level = (signal_->decoder_stack().size() - 1 - ann_stack_level);
+
+		// Only use custom cell background color if column index reached the hierarchy level
+		if (index.column() >= level) {
+			if (theme_is_dark_)
+				return QBrush(ann->dark_color());
+			else
+				return QBrush(ann->bright_color());
+		}
 	}
 
 	return QVariant();
@@ -135,12 +146,14 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 {
 	if (!signal) {
 		all_annotations_ = nullptr;
+		signal_ = nullptr;
 		dataChanged(QModelIndex(), QModelIndex());
 		layoutChanged();
 		return;
 	}
 
 	all_annotations_ = signal->get_all_annotations_by_segment(current_segment);
+	signal_ = signal;
 
 	if (!all_annotations_ || all_annotations_->empty()) {
 		prev_segment_ = current_segment;