X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=47a9980c0ff9dc8272aad16b391f96a8e361799d;hb=219b3ab99786d31cfbf010b931293c57daedacc9;hp=938d92d5b5c8d7e086fcef406ab66403fbc37b63;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9;p=pulseview.git

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 938d92d5..47a9980c 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,8 @@
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
@@ -36,18 +38,24 @@ namespace view {
 
 class AnalogSignal : public Signal
 {
+	Q_OBJECT
+
 private:
-	static const int NominalHeight;
 	static const QColor SignalColours[4];
+	static const QColor GridMajorColor, GridMinorColor;
 
 	static const float EnvelopeThreshold;
 
+	static const int MaximumVDivs;
+	static const int MaxScaleIndex, MinScaleIndex;
+	static const int InfoTextMarginRight, InfoTextMarginBottom;
+
 public:
 	AnalogSignal(pv::Session &session,
 		std::shared_ptr<sigrok::Channel> channel,
 		std::shared_ptr<pv::data::Analog> data);
 
-	virtual ~AnalogSignal();
+	virtual ~AnalogSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
@@ -89,7 +97,16 @@ public:
 	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
+	/**
+	 * Paints the foreground layer of the item with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
+	 */
+	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
 private:
+	void paint_grid(QPainter &p, int y, int left, int right);
+
 	void paint_trace(QPainter &p,
 		const std::shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
@@ -101,15 +118,32 @@ private:
 		const double pixels_offset, const double samples_per_pixel);
 
 	/**
-	 * Computes the scale factor from the scale index.
+	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
-	float scale() const;
+	float get_resolution(int scale_index);
+
+	void update_scale();
+
+protected:
+	void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+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_;
+
+	int div_height_;
+	int vdivs_;  // divs per positive/negative side
+	float resolution_; // e.g. 10 for 10 V/div
 };
 
 } // namespace view