X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fview.cpp;h=7e4b3ddb414dd28887842aad9e2f4cf421e5086e;hb=978dbc9a3e3c4bf8b42f00a269d04d0dca62b1a5;hp=3c916f4d340689ef2230978387c6dae0ca8ddb29;hpb=939d25cbcf7e6f1581f726dbd3c707d7365329d4;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.cpp b/pv/views/tabular_decoder/view.cpp
index 3c916f4d..7e4b3ddb 100644
--- a/pv/views/tabular_decoder/view.cpp
+++ b/pv/views/tabular_decoder/view.cpp
@@ -139,6 +139,14 @@ QSize CustomTableView::sizeHint() const
 	return minimumSizeHint();
 }
 
+void CustomTableView::keyPressEvent(QKeyEvent *event)
+{
+	if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter))
+		activatedByKey(currentIndex());
+	else
+		QTableView::keyPressEvent(event);
+}
+
 
 View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	ViewBase(session, is_main_view, parent),
@@ -239,6 +247,8 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 		this, SLOT(on_table_item_clicked(const QModelIndex&)));
 	connect(table_view_, SIGNAL(doubleClicked(const QModelIndex&)),
 		this, SLOT(on_table_item_double_clicked(const QModelIndex&)));
+	connect(table_view_, SIGNAL(activatedByKey(const QModelIndex&)),
+		this, SLOT(on_table_item_double_clicked(const QModelIndex&)));
 	connect(table_view_->horizontalHeader(), SIGNAL(customContextMenuRequested(const QPoint&)),
 		this, SLOT(on_table_header_requested(const QPoint&)));
 
@@ -460,6 +470,9 @@ void View::on_selected_decoder_changed(int index)
 	}
 
 	update_data();
+
+	// Force repaint, otherwise the new selection isn't shown for some reason
+	table_view_->viewport()->update();
 }
 
 void View::on_hide_hidden_changed(bool checked)
@@ -522,14 +535,16 @@ void View::on_signal_color_changed(const QColor &color)
 {
 	(void)color;
 
-	table_view_->update();
+	// Force immediate repaint, otherwise it's updated after the header popup is closed
+	table_view_->viewport()->update();
 }
 
 void View::on_new_annotations()
 {
 	if (view_mode_selector_->currentIndex() == ViewModeLatest) {
 		update_data();
-		table_view_->scrollTo(model_->index(model_->rowCount() - 1, 0),
+		table_view_->scrollTo(
+			filter_proxy_model_->index(filter_proxy_model_->rowCount() - 1, 0),
 			QAbstractItemView::PositionAtBottom);
 	} else {
 		if (!delayed_view_updater_.isActive())
@@ -598,7 +613,10 @@ void View::on_table_item_clicked(const QModelIndex& index)
 
 void View::on_table_item_double_clicked(const QModelIndex& index)
 {
-	const Annotation* ann = static_cast<const Annotation*>(index.internalPointer());
+	const QModelIndex src_idx = filter_proxy_model_->mapToSource(index);
+
+	const Annotation* ann = static_cast<const Annotation*>(src_idx.internalPointer());
+	assert(ann);
 
 	shared_ptr<views::ViewBase> main_view = session_.main_view();
 
@@ -612,7 +630,8 @@ void View::on_table_header_requested(const QPoint& pos)
 	for (int i = 0; i < table_view_->horizontalHeader()->count(); i++) {
 		int column = table_view_->horizontalHeader()->logicalIndex(i);
 
-		const QString title = model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
+		const QString title =
+			filter_proxy_model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
 		QAction* action = new QAction(title, this);
 
 		action->setCheckable(true);
@@ -643,7 +662,6 @@ void View::on_metadata_object_changed(MetadataObject* obj,
 	// 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)) {
@@ -670,6 +688,9 @@ void View::on_metadata_object_changed(MetadataObject* obj,
 				const QModelIndex idx = filter_proxy_model_->mapFromSource(first_highlighted_idx);
 				table_view_->scrollTo(idx, QAbstractItemView::EnsureVisible);
 			}
+
+			// Force repaint, otherwise the table doesn't immediately update for some reason
+			table_view_->viewport()->update();
 		}
 	}
 }