projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use QApplication metadata for persistent storage
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index c15ef0a4d07ce30b894d49d0d1611be64eaa8872..10b88b4c01d413e4d9a96fa5f1f96562d8836aed 100644
(file)
--- a/
pv/view/viewport.h
+++ b/
pv/view/viewport.h
@@
-23,6
+23,7
@@
#include <QTimer>
#include <QWidget>
#include <QTimer>
#include <QWidget>
+#include <QTouchEvent>
class QPainter;
class QPaintEvent;
class QPainter;
class QPaintEvent;
@@
-46,11
+47,16
@@
protected:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
private:
+ bool event(QEvent *event);
void mousePressEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
+ void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
+ void mouseDoubleClickEvent(QMouseEvent * event);
void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event);
+ bool touchEvent(QTouchEvent *e);
-private slots:
+private Q_SLOTS:
+ void on_signals_changed();
void on_signals_moved();
private:
void on_signals_moved();
private:
@@
-58,6
+64,11
@@
private:
QPoint _mouse_down_point;
double _mouse_down_offset;
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 view