X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=9001924a687f4f301e63c4fcc1bec24aae4d7b69;hp=b92792d7f6e630f431f8c14430a20bcec89ea3f5;hb=75d0779e498595f3a957de79eedd97c0647a2b28;hpb=834a4f1bb78a4098c59954500698bdd13060c219

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index b92792d7..9001924a 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -26,6 +26,12 @@
 #include <limits>
 
 #include <QApplication>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QSpinBox>
+#include <QString>
 
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
@@ -52,11 +58,18 @@ const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0x4E, 0x9A, 0x06)	// Green
 };
 
-const QColor AnalogSignal::GridMajorColor = QColor(0xB0, 0xB0, 0xB0);
-const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
+const int AnalogSignal::MaximumVDivs = 10;
+const int AnalogSignal::MinScaleIndex = -6;
+const int AnalogSignal::MaxScaleIndex = 7;
+
+const int AnalogSignal::InfoTextMarginRight = 20;
+const int AnalogSignal::InfoTextMarginBottom = 5;
+
 AnalogSignal::AnalogSignal(
 	pv::Session &session,
 	shared_ptr<Channel> channel,
@@ -164,18 +177,41 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 			pixels_offset, samples_per_pixel);
 }
 
+void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (!enabled())
+		return;
+
+	const int y = get_visual_y();
+
+	// Show the info section on the right side of the trace
+	const QString infotext = QString("%1 V/div").arg(resolution_);
+
+	p.setPen(colour_);
+	p.setFont(QApplication::font());
+
+	const QRectF bounding_rect = QRectF(pp.left(),
+			y + v_extents().first,
+			pp.width() - InfoTextMarginRight,
+			v_extents().second - v_extents().first - InfoTextMarginBottom);
+
+	p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+}
+
 void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
-	p.setPen(QPen(GridMajorColor, 0.5, Qt::DashLine));
+	p.setRenderHint(QPainter::Antialiasing, false);
+
+	p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
 	for (int i = 1; i <= vdivs_; i++) {
-		const int dy = i * div_height_;
+		const float dy = i * div_height_;
 		p.drawLine(QLineF(left, y - dy, right, y - dy));
 		p.drawLine(QLineF(left, y + dy, right, y + dy));
 	}
 
-	p.setPen(QPen(GridMinorColor, 0.5, Qt::DashLine));
+	p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
 	for (int i = 0; i < vdivs_; i++) {
-		const int dy = i * div_height_;
+		const float dy = i * div_height_;
 		const float dy25 = dy + (0.25 * div_height_);
 		const float dy50 = dy + (0.50 * div_height_);
 		const float dy75 = dy + (0.75 * div_height_);
@@ -186,6 +222,8 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 		p.drawLine(QLineF(left, y - dy75, right, y - dy75));
 		p.drawLine(QLineF(left, y + dy75, right, y + dy75));
 	}
+
+	p.setRenderHint(QPainter::Antialiasing, true);
 }
 
 void AnalogSignal::paint_trace(QPainter &p,
@@ -261,18 +299,82 @@ 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_;
 }
 
+void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	// Add the standard options
+	Signal::populate_popup_form(parent, form);
+
+	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)));
+	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)
+{
+	vdivs_ = vdivs;
+
+	if (owner_) {
+		// Call order is important, otherwise the lazy event handler won't work
+		owner_->extents_changed(false, true);
+		owner_->row_item_appearance_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