X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewport.h;h=f88f4f108a5a0d630709b21ca100f3c2798e1329;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hp=4add1ccfbd4c1d1bb614993d84cf1f9270004ef9;hpb=aca00b1e0d3483926c53dfd856483a397f1c29a5;p=pulseview.git

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index 4add1cc..f88f4f1 100644
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -23,6 +23,7 @@
 
 #include <QTimer>
 #include <QWidget>
+#include <QTouchEvent>
 
 class QPainter;
 class QPaintEvent;
@@ -40,18 +41,21 @@ class Viewport : public QWidget
 public:
 	explicit Viewport(View &parent);
 
-	int get_total_height() const;
+	void signals_updated();
 
 protected:
 	void paintEvent(QPaintEvent *event);
 
 private:
+	bool event(QEvent *event);
 	void mousePressEvent(QMouseEvent *event);
+	void mouseReleaseEvent(QMouseEvent *event);
 	void mouseMoveEvent(QMouseEvent *event);
+	void mouseDoubleClickEvent(QMouseEvent * event);
 	void wheelEvent(QWheelEvent *event);
+	bool touchEvent(QTouchEvent *e);
 
-private slots:
-	void on_signals_changed();
+private Q_SLOTS:
 	void on_signals_moved();
 
 private:
@@ -59,6 +63,11 @@ private:
 
 	QPoint _mouse_down_point;
 	double _mouse_down_offset;
+	bool _mouse_down_valid;
+
+	double _pinch_offset0;
+	double _pinch_offset1;
+	bool _pinch_zoom_active;
 };
 
 } // namespace view