X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=109cdd374782a906d34ed558403b8e0a9d00f94b;hp=5ea24039108908c6b2425146854b7488bfe8fd9a;hb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;hpb=fdfd5b3e246a4d4a8bcf7dbb25a6179cc86c9569

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 5ea24039..109cdd37 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,7 @@
 #include <memory>
 
 #include <QComboBox>
+#include <QSpinBox>
 
 using std::pair;
 using std::shared_ptr;
@@ -100,21 +101,21 @@ public:
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_mid(QPainter &p, 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);
+	void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
 private:
 	void paint_grid(QPainter &p, int y, int left, int right);
@@ -129,7 +130,7 @@ private:
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
-	void paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
 
 	void paint_logic_caps(QPainter &p, QLineF *const lines,
 		vector< pair<int64_t, bool> > &edges,
@@ -145,7 +146,7 @@ private:
 
 	void update_conversion_type();
 
-	void perform_autoranging(bool force_update = false);
+	void perform_autoranging(bool keep_divs, bool force_update);
 
 protected:
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -166,6 +167,7 @@ private Q_SLOTS:
 
 private:
 	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+	QSpinBox *pvdiv_sb_, *nvdiv_sb_;
 
 	float scale_;
 	int scale_index_;