Revert 33d5aa61e77e61f700a8 to re-enable A2L conversion

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index c52379534166e1b6bfd37ab35271b99a3241c912..b65eba569d54baad700f802238bc225b593ce0b6 100644 (file)
--- 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)));