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

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index b502395c..ffd151a5 100644
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -24,8 +24,15 @@
 
 #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 {
@@ -49,25 +56,38 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) :
 	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() || !signal_)
+	if (!signal_ || !index.isValid() || !index.internalPointer())
 		return QVariant();
 
 	const Annotation* ann =
 		static_cast<const Annotation*>(index.internalPointer());
 
-	if (role == Qt::DisplayRole) {
-		switch (index.column()) {
-		case 0: return QVariant((qulonglong)ann->start_sample());  // Column #0, Start Sample
-		case 1: return QVariant(0/*(qulonglong)ann->start_sample()*/);  // Column #1, Start Time
-		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();
-		}
-	}
+	if ((role == Qt::DisplayRole) || (role == Qt::ToolTipRole))
+		return data_from_ann(ann, index.column());
 
 	if (role == Qt::BackgroundRole) {
 		int level = 0;
@@ -90,15 +110,15 @@ QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) con
 Qt::ItemFlags AnnotationCollectionModel::flags(const QModelIndex& index) const
 {
 	if (!index.isValid())
-		return 0;
+		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)
+	if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole))
 		return header_data_.at(section);
 
 	return QVariant();
@@ -108,6 +128,8 @@ QModelIndex AnnotationCollectionModel::index(int row, int column,
 	const QModelIndex& parent_idx) const
 {
 	(void)parent_idx;
+	assert(row >= 0);
+	assert(column >= 0);
 
 	if (!all_annotations_)
 		return QModelIndex();