projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for clang build on OS X
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index 46bf273358e769b2112dc913569bedce82f32f5f..4add1ccfbd4c1d1bb614993d84cf1f9270004ef9 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,41
+33,26
@@
namespace view {
class View;
class View;
-class Viewport : public Q
GL
Widget
+class Viewport : public QWidget
{
Q_OBJECT
{
Q_OBJECT
-private:
- static const int SignalHeight;
-
- 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 mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void paintEvent(QPaintEvent *event);
private:
void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event);
-private:
- void setup_viewport(int width, int height);
-
- void paint_ruler(QPainter &p);
+private slots:
+ void on_signals_changed();
+ void on_signals_moved();
private:
View &_view;
private:
View &_view;
@@
-79,4
+64,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PV_VIEW_VIEWPORT_H
+#endif // P
ULSEVIEW_P
V_VIEW_VIEWPORT_H