X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=def753b2fa44b99f8e71d1db508ed103d25b422d;hp=c8692efb17d7125003b8989a2311b3b275a00b3d;hb=HEAD;hpb=8e168b23846653c087e46b6a63feffac48512ddb

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index c8692efb..def753b2 100644
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QApplication>
 #include <QDebug>
 #include <QString>
 
@@ -43,19 +44,34 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 	all_annotations_(nullptr),
 	dataset_(nullptr),
 	signal_(nullptr),
+	first_hidden_column_(0),
 	prev_segment_(0),
 	prev_last_row_(0),
-	start_index_(0),
-	end_index_(0),
+	had_highlight_before_(false),
 	hide_hidden_(false)
 {
-	// TBD Maybe use empty columns as indentation levels to indicate stacked decoders
-	header_data_.emplace_back(tr("Sample"));     // Column #0
-	header_data_.emplace_back(tr("Time"));       // Column #1
-	header_data_.emplace_back(tr("Decoder"));    // Column #2
-	header_data_.emplace_back(tr("Ann Row"));    // Column #3
-	header_data_.emplace_back(tr("Ann Class"));  // Column #4
-	header_data_.emplace_back(tr("Value"));      // Column #5
+	// Note: when adding entries, consider ViewVisibleFilterProxyModel::filterAcceptsRow()
+
+	uint8_t i = 0;
+	header_data_.emplace_back(tr("Sample"));    i++; // Column #0
+	header_data_.emplace_back(tr("Time"));      i++; // Column #1
+	header_data_.emplace_back(tr("Decoder"));   i++; // Column #2
+	header_data_.emplace_back(tr("Ann Row"));   i++; // Column #3
+	header_data_.emplace_back(tr("Ann Class")); i++; // Column #4
+	header_data_.emplace_back(tr("Value"));     i++; // Column #5
+
+	first_hidden_column_ = i;
+	header_data_.emplace_back("End Sample");         // Column #6, hidden
+}
+
+int AnnotationCollectionModel::get_hierarchy_level(const Annotation* ann) const
+{
+	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);
+
+	return level;
 }
 
 QVariant AnnotationCollectionModel::data_from_ann(const Annotation* ann, int index) const
@@ -76,6 +92,7 @@ QVariant AnnotationCollectionModel::data_from_ann(const Annotation* ann, int ind
 	case 3: return QVariant(ann->row()->description());        // Column #3, Ann Row
 	case 4: return QVariant(ann->ann_class_description());     // Column #4, Ann Class
 	case 5: return QVariant(ann->longest_annotation());        // Column #5, Value
+	case 6: return QVariant((qulonglong)ann->end_sample());    // Column #6, End Sample
 	default: return QVariant();
 	}
 }
@@ -91,18 +108,40 @@ QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) con
 	if ((role == Qt::DisplayRole) || (role == Qt::ToolTipRole))
 		return data_from_ann(ann, index.column());
 
-	if (role == Qt::BackgroundRole) {
-		int level = 0;
+	if (role == Qt::ForegroundRole) {
+		if (index.column() >= get_hierarchy_level(ann)) {
+			// Invert the text color if this cell is highlighted
+			const bool must_highlight = (highlight_sample_num_ > 0) &&
+				((int64_t)ann->start_sample() <= highlight_sample_num_) &&
+				((int64_t)ann->end_sample() >= highlight_sample_num_);
+
+			if (must_highlight) {
+				if (GlobalSettings::current_theme_is_dark())
+					return QApplication::palette().brush(QPalette::Window);
+				else
+					return QApplication::palette().brush(QPalette::WindowText);
+			}
+		}
 
-		const unsigned int ann_stack_level = ann->row_data()->row()->decoder()->get_stack_level();
-		level = (signal_->decoder_stack().size() - 1 - ann_stack_level);
+		return QApplication::palette().brush(QPalette::WindowText);
+	}
 
+	if (role == Qt::BackgroundRole) {
 		// Only use custom cell background color if column index reached the hierarchy level
-		if (index.column() >= level) {
-			if (GlobalSettings::current_theme_is_dark())
-				return QBrush(ann->dark_color());
+		if (index.column() >= get_hierarchy_level(ann)) {
+
+			QColor color;
+			const bool must_highlight = (highlight_sample_num_ > 0) &&
+				((int64_t)ann->start_sample() <= highlight_sample_num_) &&
+				((int64_t)ann->end_sample() >= highlight_sample_num_);
+
+			if (must_highlight)
+				color = ann->color();
 			else
-				return QBrush(ann->bright_color());
+				color = GlobalSettings::current_theme_is_dark() ?
+					ann->dark_color() : ann->bright_color();
+
+			return QBrush(color);
 		}
 	}
 
@@ -117,11 +156,19 @@ Qt::ItemFlags AnnotationCollectionModel::flags(const QModelIndex& index) const
 	return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemNeverHasChildren;
 }
 
+uint8_t AnnotationCollectionModel::first_hidden_column() const
+{
+	return first_hidden_column_;
+}
+
 QVariant AnnotationCollectionModel::headerData(int section, Qt::Orientation orientation,
 	int role) const
 {
+	if ((section < 0) || (section >= (int)header_data_.size()))
+		return QVariant();
+
 	if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole))
-		return header_data_.at(section);
+		return header_data_[section];
 
 	return QVariant();
 }
@@ -137,13 +184,8 @@ QModelIndex AnnotationCollectionModel::index(int row, int column,
 
 	QModelIndex idx;
 
-	if (start_index_ == end_index_) {
-		if ((size_t)row < dataset_->size())
-			idx = createIndex(row, column, (void*)dataset_->at(row));
-	} else {
-		if ((size_t)row < (end_index_ - start_index_))
-			idx = createIndex(row, column, (void*)dataset_->at(start_index_ + row));
-	}
+	if ((size_t)row < dataset_->size())
+		idx = createIndex(row, column, (void*)dataset_->at(row));
 
 	return idx;
 }
@@ -162,10 +204,7 @@ int AnnotationCollectionModel::rowCount(const QModelIndex& parent_idx) const
 	if (!dataset_)
 		return 0;
 
-	if (start_index_ == end_index_)
-		return dataset_->size();
-	else
-		return (end_index_ - start_index_);
+	return dataset_->size();
 }
 
 int AnnotationCollectionModel::columnCount(const QModelIndex& parent_idx) const
@@ -177,6 +216,8 @@ int AnnotationCollectionModel::columnCount(const QModelIndex& parent_idx) const
 
 void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signal, uint32_t current_segment)
 {
+	layoutAboutToBeChanged();
+
 	if (!signal) {
 		all_annotations_ = nullptr;
 		dataset_ = nullptr;
@@ -187,7 +228,9 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 		return;
 	}
 
-	disconnect(this, SLOT(on_annotation_visibility_changed()));
+	if (signal_)
+		for (const shared_ptr<Decoder>& dec : signal_->decoder_stack())
+			disconnect(dec.get(), nullptr, this, SLOT(on_annotation_visibility_changed()));
 
 	all_annotations_ = signal->get_all_annotations_by_segment(current_segment);
 	signal_ = signal;
@@ -196,9 +239,10 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 		connect(dec.get(), SIGNAL(annotation_visibility_changed()),
 			this, SLOT(on_annotation_visibility_changed()));
 
-	if (hide_hidden_)
+	if (hide_hidden_) {
 		update_annotations_without_hidden();
-	else
+		dataset_ = &all_annotations_without_hidden_;
+	} else
 		dataset_ = all_annotations_;
 
 	if (!dataset_ || dataset_->empty()) {
@@ -206,14 +250,11 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 		return;
 	}
 
-	// Re-apply the requested sample range
-	set_sample_range(start_sample_, end_sample_);
-
 	const size_t new_row_count = dataset_->size() - 1;
 
 	// Force the view associated with this model to update when the segment changes
 	if (prev_segment_ != current_segment) {
-		dataChanged(QModelIndex(), QModelIndex());
+		dataChanged(index(0, 0), index(new_row_count, 0));
 		layoutChanged();
 	} else {
 		// Force the view associated with this model to update when we have more annotations
@@ -227,64 +268,10 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 	prev_last_row_ = new_row_count;
 }
 
-void AnnotationCollectionModel::set_sample_range(uint64_t start_sample, uint64_t end_sample)
-{
-	// Check if there's even anything to reset
-	if ((start_sample == end_sample) && (start_index_ == end_index_))
-		return;
-
-	if (!dataset_ || dataset_->empty() || (end_sample == 0)) {
-		start_index_ = 0;
-		end_index_ = 0;
-		start_sample_ = 0;
-		end_sample_ = 0;
-
-		dataChanged(QModelIndex(), QModelIndex());
-		layoutChanged();
-		return;
-	}
-
-	start_sample_ = start_sample;
-	end_sample_ = end_sample;
-
-	// Determine first and last indices into the annotation list
-	int64_t i = -1;
-	bool ann_outside_range;
-	do {
-		i++;
-
-		if (i == (int64_t)dataset_->size()) {
-			start_index_ = 0;
-			end_index_ = 0;
-
-			dataChanged(QModelIndex(), QModelIndex());
-			layoutChanged();
-			return;
-		}
-		const Annotation* ann = (*dataset_)[i];
-		ann_outside_range =
-			((ann->start_sample() < start_sample) && (ann->end_sample() < start_sample));
-	} while (ann_outside_range);
-	start_index_ = i;
-
-	// Ideally, we would be able to set end_index_ to the last annotation that
-	// is within range. However, as annotations in the list are sorted by
-	// start sample and hierarchy level, we may encounter this scenario:
-	//   [long annotation that spans across view]
-	//   [short annotations that aren't seen]
-	//   [short annotations that are seen]
-	// ..in which our output would only show the first long annotations.
-	// For this reason, we simply show everything after the first visible
-	// annotation for now.
-
-	end_index_ = dataset_->size();
-
-	dataChanged(index(0, 0), index((end_index_ - start_index_), 0));
-	layoutChanged();
-}
-
 void AnnotationCollectionModel::set_hide_hidden(bool hide_hidden)
 {
+	layoutAboutToBeChanged();
+
 	hide_hidden_ = hide_hidden;
 
 	if (hide_hidden_) {
@@ -295,11 +282,8 @@ void AnnotationCollectionModel::set_hide_hidden(bool hide_hidden)
 		all_annotations_without_hidden_.clear();  // To conserve memory
 	}
 
-	// Re-apply the requested sample range
-	set_sample_range(start_sample_, end_sample_);
-
 	if (dataset_)
-		dataChanged(index(0, 0), index(dataset_->size(), 0));
+		dataChanged(index(0, 0), index(dataset_->size() - 1, 0));
 	else
 		dataChanged(QModelIndex(), QModelIndex());
 
@@ -328,18 +312,58 @@ void AnnotationCollectionModel::update_annotations_without_hidden()
 	all_annotations_without_hidden_.resize(count);
 }
 
+QModelIndex AnnotationCollectionModel::update_highlighted_rows(QModelIndex first,
+	QModelIndex last, int64_t sample_num)
+{
+	bool has_highlight = false;
+	QModelIndex result;
+
+	highlight_sample_num_ = sample_num;
+
+	if (!dataset_ || dataset_->empty())
+		return result;
+
+	if (sample_num >= 0) {
+		last = last.sibling(last.row() + 1, 0);
+
+		// Check if there are any annotations visible in the table view that
+		// we would need to highlight - only then do we do so
+		QModelIndex index = first;
+		do {
+			const Annotation* ann =	static_cast<const Annotation*>(index.internalPointer());
+			if (!ann)  // Can happen if the table is being modified at this exact time
+				return result;
+
+			if (((int64_t)ann->start_sample() <= sample_num) &&
+				((int64_t)ann->end_sample() >= sample_num)) {
+				result = index;
+				has_highlight = true;
+				break;
+			}
+
+			index = index.sibling(index.row() + 1, 0);
+		} while (index != last);
+	}
+
+	if (has_highlight || had_highlight_before_)
+		dataChanged(first, last);
+
+	had_highlight_before_ = has_highlight;
+
+	return result;
+}
+
 void AnnotationCollectionModel::on_annotation_visibility_changed()
 {
 	if (!hide_hidden_)
 		return;
 
-	update_annotations_without_hidden();
+	layoutAboutToBeChanged();
 
-	// Re-apply the requested sample range
-	set_sample_range(start_sample_, end_sample_);
+	update_annotations_without_hidden();
 
 	if (dataset_)
-		dataChanged(index(0, 0), index(dataset_->size(), 0));
+		dataChanged(index(0, 0), index(dataset_->size() - 1, 0));
 	else
 		dataChanged(QModelIndex(), QModelIndex());