X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=938e6add3a6236a6e5cd3ef29fec26ed7029ebe7;hb=009fc9ae42ecccd3802f549b39c19a2ba895959d;hp=1d4d839e4757be2ad20169c09b621f04044013b1;hpb=86d4b8e3e52a422fe3a6956d6bbef27f1859717b;p=pulseview.git

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index 1d4d839e..938e6add 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>
 
@@ -25,6 +26,7 @@
 #include "view.hpp"
 
 #include "pv/util.hpp"
+#include "pv/globalsettings.hpp"
 
 using std::make_shared;
 
@@ -44,11 +46,11 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 	signal_(nullptr),
 	prev_segment_(0),
 	prev_last_row_(0),
+	start_index_(0),
+	end_index_(0),
+	had_highlight_before_(false),
 	hide_hidden_(false)
 {
-	GlobalSettings::add_change_handler(this);
-	theme_is_dark_ = GlobalSettings::current_theme_is_dark();
-
 	// 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
@@ -58,6 +60,16 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 	header_data_.emplace_back(tr("Value"));      // Column #5
 }
 
+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
 {
 	switch (index) {
@@ -91,18 +103,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 (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);
 		}
 	}
 
@@ -130,16 +164,20 @@ QModelIndex AnnotationCollectionModel::index(int row, int column,
 	const QModelIndex& parent_idx) const
 {
 	(void)parent_idx;
-	assert(row >= 0);
 	assert(column >= 0);
 
-	if (!dataset_)
+	if (!dataset_ || (row < 0))
 		return QModelIndex();
 
 	QModelIndex idx;
 
-	if ((size_t)row < dataset_->size())
-		idx = createIndex(row, column, (void*)dataset_->at(row));
+	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));
+	}
 
 	return idx;
 }
@@ -158,7 +196,10 @@ int AnnotationCollectionModel::rowCount(const QModelIndex& parent_idx) const
 	if (!dataset_)
 		return 0;
 
-	return dataset_->size();
+	if (start_index_ == end_index_)
+		return dataset_->size();
+	else
+		return (end_index_ - start_index_);
 }
 
 int AnnotationCollectionModel::columnCount(const QModelIndex& parent_idx) const
@@ -180,9 +221,15 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 		return;
 	}
 
+	disconnect(this, SLOT(on_annotation_visibility_changed()));
+
 	all_annotations_ = signal->get_all_annotations_by_segment(current_segment);
 	signal_ = signal;
 
+	for (const shared_ptr<Decoder>& dec : signal_->decoder_stack())
+		connect(dec.get(), SIGNAL(annotation_visibility_changed()),
+			this, SLOT(on_annotation_visibility_changed()));
+
 	if (hide_hidden_)
 		update_annotations_without_hidden();
 	else
@@ -193,6 +240,9 @@ 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
@@ -202,8 +252,7 @@ void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signa
 	} else {
 		// Force the view associated with this model to update when we have more annotations
 		if (prev_last_row_ < new_row_count) {
-			dataChanged(index(prev_last_row_, 0, QModelIndex()),
-				index(new_row_count, 0, QModelIndex()));
+			dataChanged(index(prev_last_row_, 0), index(new_row_count, 0));
 			layoutChanged();
 		}
 	}
@@ -212,6 +261,62 @@ 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)
 {
 	hide_hidden_ = hide_hidden;
@@ -223,6 +328,16 @@ void AnnotationCollectionModel::set_hide_hidden(bool hide_hidden)
 		dataset_ = all_annotations_;
 		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));
+	else
+		dataChanged(QModelIndex(), QModelIndex());
+
+	layoutChanged();
 }
 
 void AnnotationCollectionModel::update_annotations_without_hidden()
@@ -245,19 +360,61 @@ void AnnotationCollectionModel::update_annotations_without_hidden()
 	}
 
 	all_annotations_without_hidden_.resize(count);
+}
 
-	dataChanged(index(0, 0, QModelIndex()), index(count, 0, QModelIndex()));
-	layoutChanged();
+void AnnotationCollectionModel::update_highlighted_rows(QModelIndex first,
+	QModelIndex last, int64_t sample_num)
+{
+	bool has_highlight = false;
+
+	highlight_sample_num_ = sample_num;
+
+	if (!dataset_ || dataset_->empty())
+		return;
+
+	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());
+			assert(ann);
+
+			if (((int64_t)ann->start_sample() <= sample_num) &&
+				((int64_t)ann->end_sample() >= sample_num)) {
+				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;
 }
 
-void AnnotationCollectionModel::on_setting_changed(const QString &key, const QVariant &value)
+void AnnotationCollectionModel::on_annotation_visibility_changed()
 {
-	(void)key;
-	(void)value;
+	if (!hide_hidden_)
+		return;
+
+	update_annotations_without_hidden();
 
-	// We don't really care about the actual setting, we just update the
-	// flag that indicates whether we are using a bright or dark color theme
-	theme_is_dark_ = GlobalSettings::current_theme_is_dark();
+	// Re-apply the requested sample range
+	set_sample_range(start_sample_, end_sample_);
+
+	if (dataset_)
+		dataChanged(index(0, 0), index(dataset_->size(), 0));
+	else
+		dataChanged(QModelIndex(), QModelIndex());
+
+	layoutChanged();
 }
 
 } // namespace tabular_decoder