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

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index 4add1cc..1f8f8f6 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;
@@ -42,16 +43,21 @@ public:
 
 	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 +65,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