X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.h;h=1f8f8f61095748e4290911e1fe5caa2d4cbedd74;hb=f0c0b38f812bfbb2bb1978d40e2ce93f1da3f89d;hp=e2517fa776156f1ef28e6c80e04914658855ba75;hpb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e;p=pulseview.git

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index e2517fa7..1f8f8f61 100644
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -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 <QTimer>
 #include <QWidget>
+#include <QTouchEvent>
 
 class QPainter;
 class QPaintEvent;
@@ -42,23 +43,36 @@ public:
 
 	int get_total_height() const;
 
+	void signals_updated();
+
 protected:
 	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 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