X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=109cdd374782a906d34ed558403b8e0a9d00f94b;hb=4c7a19d3d7049bcc9fb3185ce2bc91333a7ca9e1;hp=32af0171399e0864143048f62654f1f7b8fb9567;hpb=b8c4a95bc26d2976ea80001846d1ab7eb15cd3d5;p=pulseview.git

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 32af017..109cdd3 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;
@@ -49,6 +50,7 @@ private:
 	static const QColor GridMajorColor, GridMinorColor;
 	static const QColor SamplingPointColour;
 
+	static const int64_t TracePaintBlockSize;
 	static const float EnvelopeThreshold;
 
 	static const int MaximumVDivs;
@@ -99,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);
@@ -128,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,
@@ -144,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);
@@ -165,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_;