projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index a33d4045178628b4de8c2173e549efd21e3fc2df..1171a70730c8ed9490e5de549c19b46b250de8a0 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;
@@
-40,22
+41,31
@@
class Viewport : public QWidget
public:
explicit Viewport(View &parent);
public:
explicit Viewport(View &parent);
- int get_total_height() const;
-
protected:
void paintEvent(QPaintEvent *event);
private:
protected:
void paintEvent(QPaintEvent *event);
private:
+ bool event(QEvent *event);
void mousePressEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
+ void mouseMoveEvent(QMouseEvent *event);
+ void mouseDoubleClickEvent(QMouseEvent * event);
void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event);
+ bool touchEvent(QTouchEvent *e);
+
+private Q_SLOTS:
+ void on_signals_moved();
private:
private:
- View &_view;
+ View &view_;
+
+ QPoint mouse_down_point_;
+ double mouse_down_offset_;
+ bool mouse_down_valid_;
- QPoint _mouse_down_point;
- double _mouse_down_offset;
+ double pinch_offset0_;
+ double pinch_offset1_;
+ bool pinch_zoom_active_;
};
} // namespace view
};
} // namespace view