X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=sigview.h;h=3630d17e572cfe074a893d7463370d0af4148a3e;hp=ccbc8c84eb78d8e944bff478b00cfdcc68fc55e4;hb=ecda6ca9b83e5ed9988c64ed9fc4e4a33b8a5457;hpb=7cd5faf8cfed1871195aed7a4c325342172944b3

diff --git a/sigview.h b/sigview.h
index ccbc8c84..3630d17e 100644
--- a/sigview.h
+++ b/sigview.h
@@ -24,6 +24,8 @@
 #include <QtOpenGL/QGLWidget>
 #include <QTimer>
 
+class QPainter;
+class QPaintEvent;
 class SigSession;
 
 class SigView : public QGLWidget
@@ -31,32 +33,56 @@ class SigView : public QGLWidget
 	Q_OBJECT
 
 private:
+	static const double MaxScale;
+	static const double MinScale;
+
 	static const int SignalHeight;
+	static const int LabelMarginWidth;
+	static const int RulerHeight;
+
+	static const int MinorTickSubdivision;
+	static const int ScaleUnits[3];
+
+	static const QString SIPrefixes[9];
+	static const int FirstSIPrefixPower;
 
 public:
 	explicit SigView(SigSession &session, QWidget *parent = 0);
 
+	void zoom(double steps);
+
 protected:
 
 	void initializeGL();
 
 	void resizeGL(int width, int height);
 
-	void paintGL();
+	void paintEvent(QPaintEvent *event);
 
 private:
-	void mouseMoveEvent(QMouseEvent *event);
 	void mousePressEvent(QMouseEvent *event);
+	void mouseMoveEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
+	void wheelEvent(QWheelEvent *event);
+
+private:
+	void setup_viewport(int width, int height);
+
+	void paint_ruler(QPainter &p);
+
+	void zoom(double steps, int offset);
 
 private slots:
-	void dataUpdated();
+	void data_updated();
 
 private:
 	SigSession &_session;
 
-	uint64_t _scale;
-	int64_t _offset;
+	double _scale;
+	double _offset;
+
+	QPoint _mouse_down_point;
+	double _mouse_down_offset;
 };
 
 #endif // SIGVIEW_H