X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.h;h=1171a70730c8ed9490e5de549c19b46b250de8a0;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=690642c28c2de1f05cab75d86698bd7abdaad9fc;hpb=1d8dca913d07df3a53184e40246eb2e333520e31;p=pulseview.git

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index 690642c..1171a70 100644
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_VIEWPORT_H
-#define PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
+#define PULSEVIEW_PV_VIEW_VIEWPORT_H
 
-#include <QtOpenGL/QGLWidget>
 #include <QTimer>
+#include <QWidget>
+#include <QTouchEvent>
 
 class QPainter;
 class QPaintEvent;
@@ -33,48 +34,41 @@ namespace view {
 
 class View;
 
-class Viewport : public QGLWidget
+class Viewport : public QWidget
 {
 	Q_OBJECT
 
-private:
-	static const int MinorTickSubdivision;
-	static const int ScaleUnits[3];
-
-	static const QString SIPrefixes[9];
-	static const int FirstSIPrefixPower;
-
 public:
 	explicit Viewport(View &parent);
 
-	int get_total_height() const;
-
 protected:
-	void initializeGL();
-
-	void resizeGL(int width, int height);
-
 	void paintEvent(QPaintEvent *event);
 
 private:
+	bool event(QEvent *event);
 	void mousePressEvent(QMouseEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
+	void mouseMoveEvent(QMouseEvent *event);
+	void mouseDoubleClickEvent(QMouseEvent * event);
 	void wheelEvent(QWheelEvent *event);
+	bool touchEvent(QTouchEvent *e);
 
-private:
-	void setup_viewport(int width, int height);
-
-	void paint_ruler(QPainter &p);
+private Q_SLOTS:
+	void on_signals_moved();
 
 private:
-	View &_view;
+	View &view_;
+
+	QPoint mouse_down_point_;
+	double mouse_down_offset_;
+	bool mouse_down_valid_;
 
-	QPoint _mouse_down_point;
-	double _mouse_down_offset;
+	double pinch_offset0_;
+	double pinch_offset1_;
+	bool pinch_zoom_active_;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H