X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fview.cpp;h=2283d68ce780d0300f9d4b3a05464ff88f2089b8;hb=009fc9ae42ecccd3802f549b39c19a2ba895959d;hp=6ee3e2ac13b1871b632bfa229c44ef0f4d4b4ca4;hpb=c84afcfd68ab1fef53e579c8c04d4e83ef9597a0;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.cpp b/pv/views/tabular_decoder/view.cpp
index 6ee3e2ac..2283d68c 100644
--- a/pv/views/tabular_decoder/view.cpp
+++ b/pv/views/tabular_decoder/view.cpp
@@ -45,6 +45,7 @@ using pv::data::decode::Decoder;
 using pv::util::Timestamp;
 
 using std::make_shared;
+using std::max;
 using std::shared_ptr;
 
 namespace pv {
@@ -58,8 +59,8 @@ const char* SaveTypeNames[SaveTypeCount] = {
 
 const char* ViewModeNames[ViewModeCount] = {
 	"Show all",
-	"Show all and focus on newest"
-//	"Show visible in main view"
+	"Show all and focus on newest",
+	"Show visible in main view"
 };
 
 QSize QCustomTableView::minimumSizeHint() const
@@ -145,7 +146,7 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 
 	for (int i = 0; i < SaveTypeCount; i++) {
 		QAction *const action =	save_menu->addAction(tr(SaveTypeNames[i]));
-		action->setData(qVariantFromValue(i));
+		action->setData(QVariant::fromValue(i));
 	}
 
 	save_button_->setMenu(save_menu);
@@ -156,7 +157,7 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	table_view_->setModel(model_);
 	table_view_->setSelectionBehavior(QAbstractItemView::SelectRows);
 	table_view_->setSelectionMode(QAbstractItemView::ContiguousSelection);
-	table_view_->setSortingEnabled(true);
+	table_view_->setSortingEnabled(false);
 	table_view_->sortByColumn(0, Qt::AscendingOrder);
 
 	const int font_height = QFontMetrics(QApplication::font()).height();
@@ -178,9 +179,17 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	connect(table_view_->horizontalHeader(), SIGNAL(customContextMenuRequested(const QPoint&)),
 		this, SLOT(on_table_header_requested(const QPoint&)));
 
+	// Set up metadata event handler
+	session_.metadata_obj_manager()->add_observer(this);
+
 	reset_view_state();
 }
 
+View::~View()
+{
+	session_.metadata_obj_manager()->remove_observer(this);
+}
+
 ViewType View::get_type() const
 {
 	return ViewTypeTabularDecoder;
@@ -400,7 +409,24 @@ void View::on_hide_hidden_changed(bool checked)
 
 void View::on_view_mode_changed(int index)
 {
-	(void)index;
+	if (index == ViewModeVisible) {
+		MetadataObject *md_obj =
+			session_.metadata_obj_manager()->find_object_by_type(MetadataObjMainViewRange);
+		assert(md_obj);
+
+		int64_t start_sample = md_obj->value(MetadataValueStartSample).toLongLong();
+		int64_t end_sample = md_obj->value(MetadataValueEndSample).toLongLong();
+
+		model_->set_sample_range(max((int64_t)0, start_sample),
+			max((int64_t)0, end_sample));
+	} else {
+		// Reset the model's data range
+		model_->set_sample_range(0, 0);
+	}
+
+	if (index == ViewModeLatest)
+		table_view_->scrollTo(model_->index(model_->rowCount() - 1, 0),
+			QAbstractItemView::PositionAtBottom);
 }
 
 void View::on_signal_name_changed(const QString &name)
@@ -543,6 +569,33 @@ void View::on_table_header_toggled(bool checked)
 	table_view_->horizontalHeader()->setSectionHidden(column, !checked);
 }
 
+void View::on_metadata_object_changed(MetadataObject* obj,
+	MetadataValueType value_type)
+{
+	// Check if we need to update the model's data range. We only work on the
+	// end sample value because the start sample value is updated first and
+	// we don't want to update the model twice
+
+	if ((view_mode_selector_->currentIndex() == ViewModeVisible) &&
+		(obj->type() == MetadataObjMainViewRange) &&
+		(value_type == MetadataValueEndSample)) {
+
+		int64_t start_sample = obj->value(MetadataValueStartSample).toLongLong();
+		int64_t end_sample = obj->value(MetadataValueEndSample).toLongLong();
+
+		model_->set_sample_range(max((int64_t)0, start_sample),
+			max((int64_t)0, end_sample));
+	}
+
+	if (obj->type() == MetadataObjMousePos) {
+		QModelIndex first_visual_idx = table_view_->indexAt(table_view_->rect().topLeft());
+		QModelIndex last_visual_idx = table_view_->indexAt(table_view_->rect().bottomLeft());
+
+		model_->update_highlighted_rows(first_visual_idx, last_visual_idx,
+			obj->value(MetadataValueStartSample).toLongLong());
+	}
+}
+
 void View::perform_delayed_view_update()
 {
 	update_data();