From 7c84c074f1aab8e8b78c802d0cb6c48282869253 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Mon, 12 Jun 2017 07:06:43 +0200 Subject: [PATCH 1/1] Revert 33d5aa61e77e61f700a8 to re-enable A2L conversion --- pv/views/trace/analogsignal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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))); -- 2.30.2