projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
icons: Renamed probe.svg to channels.svg
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index 690642c28c2de1f05cab75d86698bd7abdaad9fc..10b88b4c01d413e4d9a96fa5f1f96562d8836aed 100644
(file)
--- a/
pv/view/viewport.h
+++ b/
pv/view/viewport.h
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-18,11
+18,12
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PV_VIEW_VIEWPORT_H
-#define PV_VIEW_VIEWPORT_H
+#ifndef P
ULSEVIEW_P
V_VIEW_VIEWPORT_H
+#define P
ULSEVIEW_P
V_VIEW_VIEWPORT_H
-#include <QtOpenGL/QGLWidget>
#include <QTimer>
#include <QTimer>
+#include <QWidget>
+#include <QTouchEvent>
class QPainter;
class QPaintEvent;
class QPainter;
class QPaintEvent;
@@
-33,48
+34,44
@@
namespace view {
class View;
class View;
-class Viewport : public Q
GL
Widget
+class Viewport : public QWidget
{
Q_OBJECT
{
Q_OBJECT
-private:
- static const int MinorTickSubdivision;
- static const int ScaleUnits[3];
-
- static const QString SIPrefixes[9];
- static const int FirstSIPrefixPower;
-
public:
explicit Viewport(View &parent);
int get_total_height() const;
protected:
public:
explicit Viewport(View &parent);
int get_total_height() const;
protected:
- void initializeGL();
-
- void resizeGL(int width, int height);
-
void paintEvent(QPaintEvent *event);
private:
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:
- void setup_viewport(int width, int height);
-
- void paint_ruler(QPainter &p);
+private Q_SLOTS:
+ void on_signals_changed();
+ void on_signals_moved();
private:
View &_view;
QPoint _mouse_down_point;
double _mouse_down_offset;
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
};
} // namespace view
} // namespace pv
-#endif // PV_VIEW_VIEWPORT_H
+#endif // P
ULSEVIEW_P
V_VIEW_VIEWPORT_H