From: Soeren Apel <redacted>
Date: Mon, 12 Jun 2017 05:06:43 +0000 (+0200)
Subject: Revert 33d5aa61e77e61f700a8 to re-enable A2L conversion
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7c84c074f1aab8e8b78c802d0cb6c48282869253;p=pulseview.git

Revert 33d5aa61e77e61f700a8 to re-enable A2L conversion
---

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index c5237953..b65eba56 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -720,7 +720,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	cur_idx = conversion_cb_->findData(QVariant(conversion_type_));
 	conversion_cb_->setCurrentIndex(cur_idx);
 
-//	layout->addRow(tr("Conversion"), conversion_cb_);
+	layout->addRow(tr("Conversion"), conversion_cb_);
 
 	connect(conversion_cb_, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_conversion_changed(int)));
@@ -735,7 +735,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	cur_idx = display_type_cb_->findData(QVariant(display_type_));
 	display_type_cb_->setCurrentIndex(cur_idx);
 
-//	layout->addRow(tr("Traces to show:"), display_type_cb_);
+	layout->addRow(tr("Traces to show:"), display_type_cb_);
 
 	connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_display_type_changed(int)));