From: Soeren Apel <redacted>
Date: Sun, 28 May 2017 08:19:11 +0000 (+0200)
Subject: AnalogSignal: Temporarily disable analog signal conversion
X-Git-Tag: pulseview-0.4.0~68
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=33d5aa61e77e61f700a8d09586724a2f12351c53;p=pulseview.git

AnalogSignal: Temporarily disable analog signal conversion

This feature isn't ready yet, so hide it for now.
---

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 31c482d6..e40042da 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -700,7 +700,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)));
@@ -715,7 +715,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)));