projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a separate widget to hold the cursor labels.
[pulseview.git]
/
pv
/
view
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 7bdde99c15c3066dfaac5a1e37b6ee95306e123f..cee76c685c5a5e3d40dbf8a5a78caa6e6b97a9a9 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-21,43
+21,34
@@
#ifndef PULSEVIEW_PV_VIEW_RULER_H
#define PULSEVIEW_PV_VIEW_RULER_H
#ifndef PULSEVIEW_PV_VIEW_RULER_H
#define PULSEVIEW_PV_VIEW_RULER_H
-#include <QWidget>
+#include <memory>
+
+#include "marginwidget.h"
namespace pv {
namespace view {
namespace pv {
namespace view {
-class TimeMarker;
-class View;
-
-class Ruler : public QWidget
+class Ruler : public MarginWidget
{
Q_OBJECT
private:
{
Q_OBJECT
private:
+ static const int RulerHeight;
static const int MinorTickSubdivision;
static const int ScaleUnits[3];
static const int MinorTickSubdivision;
static const int ScaleUnits[3];
- static const QString SIPrefixes[9];
- static const int FirstSIPrefixPower;
-
static const int HoverArrowSize;
public:
Ruler(View &parent);
static const int HoverArrowSize;
public:
Ruler(View &parent);
+public:
+ QSize sizeHint() const;
+
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
- void mouseMoveEvent(QMouseEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *);
-
private:
private:
- static QString format_time(double t, double multiplier,
- unsigned int prefix);
-
- void draw_cursors(QPainter &p);
-
/**
* Draw a hover arrow under the cursor position.
*/
/**
* Draw a hover arrow under the cursor position.
*/
@@
-65,11
+56,6
@@
private:
private slots:
void hover_point_changed();
private slots:
void hover_point_changed();
-
-private:
- View &_view;
-
- TimeMarker *_grabbed_marker;
};
} // namespace view
};
} // namespace view