projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stopped ruler values colliding at high zoom
[pulseview.git]
/
pv
/
view
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 1381502d3de48f7c8c64168110e0f7e34a7d0236..7bdde99c15c3066dfaac5a1e37b6ee95306e123f 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-26,6
+26,7
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
+class TimeMarker;
class View;
class Ruler : public QWidget
class View;
class Ruler : public QWidget
@@
-47,7
+48,14
@@
public:
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);
/**
void draw_cursors(QPainter &p);
/**
@@
-60,6
+68,8
@@
private slots:
private:
View &_view;
private:
View &_view;
+
+ TimeMarker *_grabbed_marker;
};
} // namespace view
};
} // namespace view