From: Soeren Apel <redacted>
Date: Thu, 7 Apr 2016 20:03:30 +0000 (+0200)
Subject: AnalogSignal: Implement resolution selector in dialog
X-Git-Tag: pulseview-0.4.0~315
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=368a37c2d818f9a7122f07e4a13df5416e05a02e;p=pulseview.git

AnalogSignal: Implement resolution selector in dialog
---

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 1b4e3208..6703ce9e 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -26,7 +26,10 @@
 #include <limits>
 
 #include <QApplication>
+#include <QComboBox>
 #include <QFormLayout>
+#include <QGridLayout>
+#include <QLabel>
 #include <QSpinBox>
 
 #include "analogsignal.hpp"
@@ -60,6 +63,8 @@ const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
+const int AnalogSignal::MinScaleIndex = -6;
+const int AnalogSignal::MaxScaleIndex = 7;
 
 AnalogSignal::AnalogSignal(
 	pv::Session &session,
@@ -265,16 +270,21 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	delete[] e.samples;
 }
 
-void AnalogSignal::update_scale()
+float AnalogSignal::get_resolution(int scale_index)
 {
 	const float seq[] = {1.0f, 2.0f, 5.0f};
 
 	const int offset = std::numeric_limits<int>::max() / (2 * countof(seq));
 	const std::div_t d = std::div(
-		(int)(scale_index_ + countof(seq) * offset),
+		(int)(scale_index + countof(seq) * offset),
 		countof(seq));
 
-	resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem];
+	return powf(10.0f, d.quot - offset) * seq[d.rem];
+}
+
+void AnalogSignal::update_scale()
+{
+	resolution_ = get_resolution(scale_index_);
 	scale_ = div_height_ / resolution_;
 }
 
@@ -283,13 +293,38 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	// Add the standard options
 	Signal::populate_popup_form(parent, form);
 
-	// Add the vdiv settings
+	QFormLayout *const layout = new QFormLayout;
+
+	// Add the number of vdivs
 	QSpinBox *vdiv_sb = new QSpinBox(parent);
 	vdiv_sb->setRange(1, MaximumVDivs);
 	vdiv_sb->setValue(vdivs_);
 	connect(vdiv_sb, SIGNAL(valueChanged(int)),
 		this, SLOT(on_vdivs_changed(int)));
-	form->addRow(tr("Number of vertical divs"), vdiv_sb);
+	layout->addRow(tr("Number of vertical divs"), vdiv_sb);
+
+	// Add the vertical resolution
+	resolution_cb_ = new QComboBox(parent);
+
+	for (int i = MinScaleIndex; i < MaxScaleIndex; i++) {
+		const QString label = QString("%1").arg(get_resolution(i));
+		resolution_cb_->insertItem(0, label, QVariant(i));
+	}
+
+	const int cur_idx = resolution_cb_->findData(QVariant(scale_index_));
+	resolution_cb_->setCurrentIndex(cur_idx);
+
+	connect(resolution_cb_, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_resolution_changed(int)));
+
+	QGridLayout *const vdiv_layout = new QGridLayout;
+	QLabel *const vdiv_unit = new QLabel(tr("V/div"));
+	vdiv_layout->addWidget(resolution_cb_, 0, 0);
+	vdiv_layout->addWidget(vdiv_unit, 0, 1);
+
+	layout->addRow(tr("Vertical resolution"), vdiv_layout);
+
+	form->addRow(layout);
 }
 
 void AnalogSignal::on_vdivs_changed(int vdivs)
@@ -300,6 +335,14 @@ void AnalogSignal::on_vdivs_changed(int vdivs)
 		owner_->extents_changed(false, true);
 }
 
+void AnalogSignal::on_resolution_changed(int index)
+{
+	scale_index_ = resolution_cb_->itemData(index).toInt();
+	update_scale();
+
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
+}
 
 } // namespace view
 } // namespace pv
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 07de4eb4..9c9c6db8 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,8 @@
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
@@ -45,6 +47,7 @@ private:
 	static const float EnvelopeThreshold;
 
 	static const int MaximumVDivs;
+	static const int MaxScaleIndex, MinScaleIndex;
 
 public:
 	AnalogSignal(pv::Session &session,
@@ -109,6 +112,8 @@ private:
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
+	float get_resolution(int scale_index);
+
 	void update_scale();
 
 protected:
@@ -117,9 +122,13 @@ protected:
 private Q_SLOTS:
 	void on_vdivs_changed(int vdivs);
 
+	void on_resolution_changed(int index);
+
 private:
 	std::shared_ptr<pv::data::Analog> data_;
 
+	QComboBox *resolution_cb_;
+
 	float scale_;
 	int scale_index_;
 	int scale_index_drag_offset_;