projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added cursor dragging
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index b79526ac2c8d783685aa100b6df8d424dde821fd..49b97e3b0d71de953db0b76e70dc9b68e0b7f55a 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,11
@@
* 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>
class QPainter;
class QPaintEvent;
class QPainter;
class QPaintEvent;
@@
-33,7
+33,7
@@
namespace view {
class View;
class View;
-class Viewport : public Q
GL
Widget
+class Viewport : public QWidget
{
Q_OBJECT
{
Q_OBJECT
@@
-43,10
+43,6
@@
public:
int get_total_height() const;
protected:
int get_total_height() const;
protected:
- void initializeGL();
-
- void resizeGL(int width, int height);
-
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
private:
@@
-56,7
+52,9
@@
private:
void wheelEvent(QWheelEvent *event);
private:
void wheelEvent(QWheelEvent *event);
private:
- void setup_viewport(int width, int height);
+ void draw_cursors_background(QPainter &p);
+
+ void draw_cursors_foreground(QPainter &p);
private:
View &_view;
private:
View &_view;
@@
-68,4
+66,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PV_VIEW_VIEWPORT_H
+#endif // P
ULSEVIEW_P
V_VIEW_VIEWPORT_H