X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.h;h=f88f4f108a5a0d630709b21ca100f3c2798e1329;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hp=b79526ac2c8d783685aa100b6df8d424dde821fd;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37;p=pulseview.git

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index b79526a..f88f4f1 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,39 +34,43 @@ namespace view {
 
 class View;
 
-class Viewport : public QGLWidget
+class Viewport : public QWidget
 {
 	Q_OBJECT
 
 public:
 	explicit Viewport(View &parent);
 
-	int get_total_height() const;
+	void signals_updated();
 
 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);
+private Q_SLOTS:
+	void on_signals_moved();
 
 private:
 	View &_view;
 
 	QPoint _mouse_down_point;
 	double _mouse_down_offset;
+	bool _mouse_down_valid;
+
+	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