projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Temporarily disable analog signal conversion
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 106735567c78e11363a2c0d9cda6d750c0b1f937..e40042dac9fc4057d20e595473a36fb80fdc5f20 100644
(file)
--- 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);
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)));
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);
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)));
connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_display_type_changed(int)));
@@
-726,9
+726,6
@@
void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
void AnalogSignal::on_samples_added()
{
perform_autoranging(false, false);
void AnalogSignal::on_samples_added()
{
perform_autoranging(false, false);
-
- if (owner_)
- owner_->row_item_appearance_changed(false, true);
}
void AnalogSignal::on_pos_vdivs_changed(int vdivs)
}
void AnalogSignal::on_pos_vdivs_changed(int vdivs)