X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=0c89cef314f3a8547dfdad3659a90fc1c21676cc;hp=35cdc9583b8c92c86b283c990107f9eda18be87f;hb=85125b0f34be424fdf8a8a5133f2494722077d7d;hpb=24d69d27584c7adec70bc0d6db764a3db04fce3c

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index 35cdc958..0c89cef3 100644
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -17,47 +17,91 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QDebug>
 #include <QString>
 
 #include "pv/views/tabular_decoder/view.hpp"
 
+#include "view.hpp"
+
+#include "pv/util.hpp"
+
 using std::make_shared;
 
+using pv::util::Timestamp;
+using pv::util::format_time_si;
+using pv::util::format_time_minutes;
+using pv::util::SIPrefix;
+
 namespace pv {
 namespace views {
 namespace tabular_decoder {
 
 AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
-	QAbstractItemModel(parent)
+	QAbstractTableModel(parent),
+	all_annotations_(nullptr),
+	signal_(nullptr),
+	prev_segment_(0),
+	prev_last_row_(0)
 {
-	vector<QVariant> header_data;
-	header_data.emplace_back(tr("ID"));                // Column #0
-	header_data.emplace_back(tr("Start Time"));        // Column #1
-	header_data.emplace_back(tr("End Time"));          // Column #2
-	header_data.emplace_back(tr("Ann Row Name"));      // Column #3
-	header_data.emplace_back(tr("Class Row Name"));    // Column #4
-	header_data.emplace_back(tr("Value"));             // Column #5
-	root_ = make_shared<AnnotationCollectionItem>(header_data);
+	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
+	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
+}
+
+QVariant AnnotationCollectionModel::data_from_ann(const Annotation* ann, int index) const
+{
+	switch (index) {
+	case 0: return QVariant((qulonglong)ann->start_sample());  // Column #0, Start Sample
+	case 1: {                                                  // Column #1, Start Time
+			Timestamp t = ann->start_sample() / signal_->get_samplerate();
+			QString unit = signal_->get_samplerate() ? tr("s") : tr("sa");
+			QString s;
+			if ((t < 60) || (signal_->get_samplerate() == 0))  // i.e. if unit is sa
+				s = format_time_si(t, SIPrefix::unspecified, 3, unit, false);
+			else
+				s = format_time_minutes(t, 3, false);
+			return QVariant(s);
+		}
+	case 2: return QVariant(ann->row()->decoder()->name());    // Column #2, Decoder
+	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
+	default: return QVariant();
+	}
 }
 
 QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) const
 {
-	if (!index.isValid())
+	if (!index.isValid() || !signal_)
 		return QVariant();
 
-	if (role == Qt::DisplayRole)
-	{
-		AnnotationCollectionItem* item =
-			static_cast<AnnotationCollectionItem*>(index.internalPointer());
+	const Annotation* ann =
+		static_cast<const Annotation*>(index.internalPointer());
 
-		return item->data(index.column());
-	}
+	if ((role == Qt::DisplayRole) || (role == Qt::ToolTipRole))
+		return data_from_ann(ann, index.column());
 
-	if ((role == Qt::FontRole) && (index.parent().isValid()) && (index.column() == 0))
-	{
-		QFont font;
-		font.setItalic(true);
-		return QVariant(font);
+	if (role == Qt::BackgroundRole) {
+		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();
@@ -66,16 +110,16 @@ QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) con
 Qt::ItemFlags AnnotationCollectionModel::flags(const QModelIndex& index) const
 {
 	if (!index.isValid())
-		return nullptr;
+		return Qt::NoItemFlags;
 
-	return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+	return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemNeverHasChildren;
 }
 
 QVariant AnnotationCollectionModel::headerData(int section, Qt::Orientation orientation,
 	int role) const
 {
 	if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
-		return root_->data(section);
+		return header_data_.at(section);
 
 	return QVariant();
 }
@@ -83,55 +127,87 @@ QVariant AnnotationCollectionModel::headerData(int section, Qt::Orientation orie
 QModelIndex AnnotationCollectionModel::index(int row, int column,
 	const QModelIndex& parent_idx) const
 {
-	if (!hasIndex(row, column, parent_idx))
-		return QModelIndex();
-
-	AnnotationCollectionItem* parent = root_.get();
+	(void)parent_idx;
 
-	if (parent_idx.isValid())
-		parent = static_cast<AnnotationCollectionItem*>(parent_idx.internalPointer());
+	if (!all_annotations_)
+		return QModelIndex();
 
-	AnnotationCollectionItem* subItem = parent->subItem(row).get();
+	if ((size_t)row > all_annotations_->size())
+		return QModelIndex();
 
-	return subItem ? createIndex(row, column, subItem) : QModelIndex();
+	return createIndex(row, column, (void*)(all_annotations_->at(row)));
 }
 
 QModelIndex AnnotationCollectionModel::parent(const QModelIndex& index) const
 {
-	if (!index.isValid())
-		return QModelIndex();
+	(void)index;
 
-	AnnotationCollectionItem* subItem =
-		static_cast<AnnotationCollectionItem*>(index.internalPointer());
-
-	shared_ptr<AnnotationCollectionItem> parent = subItem->parent();
-
-	return (parent == root_) ? QModelIndex() :
-		createIndex(parent->row(), 0, parent.get());
+	return QModelIndex();
 }
 
 int AnnotationCollectionModel::rowCount(const QModelIndex& parent_idx) const
 {
-	AnnotationCollectionItem* parent = root_.get();
+	(void)parent_idx;
 
-	if (parent_idx.column() > 0)
+	if (!all_annotations_)
 		return 0;
 
-	if (parent_idx.isValid())
-		parent = static_cast<AnnotationCollectionItem*>(parent_idx.internalPointer());
-
-	return parent->subItemCount();
+	return all_annotations_->size();
 }
 
 int AnnotationCollectionModel::columnCount(const QModelIndex& parent_idx) const
 {
-	if (parent_idx.isValid())
-		return static_cast<AnnotationCollectionItem*>(
-			parent_idx.internalPointer())->columnCount();
-	else
-		return root_->columnCount();
+	(void)parent_idx;
+
+	return header_data_.size();
 }
 
+void AnnotationCollectionModel::set_signal_and_segment(data::DecodeSignal* signal, uint32_t current_segment)
+{
+	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;
+		return;
+	}
+
+	const size_t new_row_count = all_annotations_->size() - 1;
+
+	// Force the view associated with this model to update when the segment changes
+	if (prev_segment_ != current_segment) {
+		dataChanged(QModelIndex(), QModelIndex());
+		layoutChanged();
+	} 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()));
+			layoutChanged();
+		}
+	}
+
+	prev_segment_ = current_segment;
+	prev_last_row_ = new_row_count;
+}
+
+void AnnotationCollectionModel::on_setting_changed(const QString &key, const QVariant &value)
+{
+	(void)key;
+	(void)value;
+
+	// 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();
+}
 
 } // namespace tabular_decoder
 } // namespace views