From: Soeren Apel <redacted>
Date: Wed, 22 Mar 2017 21:33:09 +0000 (+0100)
Subject: AnalogSignal: display type-related improvements
X-Git-Tag: pulseview-0.4.0~131
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b8c4a95bc26d2976ea80001846d1ab7eb15cd3d5;p=pulseview.git

AnalogSignal: display type-related improvements

1) Only show the v/div setting if analog trace is drawn
2) Update the trace when the display type is changed
---

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 1cdea278..8f79f919 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -243,20 +243,22 @@ void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 	if (!enabled())
 		return;
 
-	const int y = get_visual_y();
+	if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) {
+		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_);
+		// Show the info section on the right side of the trace
+		const QString infotext = QString("%1 V/div").arg(resolution_);
 
-	p.setPen(base_->colour());
-	p.setFont(QApplication::font());
+		p.setPen(base_->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);
+		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);
+		p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+	}
 }
 
 void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
@@ -675,6 +677,9 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	layout->addRow(tr("Traces to show:"), display_type_cb_);
 
+	connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_display_type_changed(int)));
+
 	form->addRow(layout);
 }
 
@@ -752,6 +757,14 @@ void AnalogSignal::on_conversion_changed(int index)
 	}
 }
 
+void AnalogSignal::on_display_type_changed(int index)
+{
+	display_type_ = (DisplayType)(display_type_cb_->itemData(index).toInt());
+
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
+}
+
 } // namespace TraceView
 } // namespace views
 } // namespace pv
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 4e840ed3..32af0171 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -161,6 +161,8 @@ private Q_SLOTS:
 
 	void on_conversion_changed(int index);
 
+	void on_display_type_changed(int index);
+
 private:
 	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;