projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrapped Cursors in a shared_ptr
[pulseview.git]
/
pv
/
view
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 1381502d3de48f7c8c64168110e0f7e34a7d0236..7514aeca86672d849f82019b1c257232f6afba16 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-21,14
+21,17
@@
#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 <boost/weak_ptr.hpp>
+
+#include "marginwidget.h"
namespace pv {
namespace view {
namespace pv {
namespace view {
+class TimeMarker;
class View;
class View;
-class Ruler : public
Q
Widget
+class Ruler : public
Margin
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-44,12
+47,19
@@
private:
public:
Ruler(View &parent);
public:
Ruler(View &parent);
+ void clear_selection();
+
+ static QString format_time(double t, unsigned int prefix,
+ unsigned precision = 0);
+
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
-private:
- void draw_cursors(QPainter &p);
+ void mouseMoveEvent(QMouseEvent *e);
+ void mousePressEvent(QMouseEvent *e);
+ void mouseReleaseEvent(QMouseEvent *);
+private:
/**
* Draw a hover arrow under the cursor position.
*/
/**
* Draw a hover arrow under the cursor position.
*/
@@
-59,7
+69,7
@@
private slots:
void hover_point_changed();
private:
void hover_point_changed();
private:
-
View &_view
;
+
boost::weak_ptr<TimeMarker> _grabbed_marker
;
};
} // namespace view
};
} // namespace view