projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved form generation into Binding
[pulseview.git]
/
pv
/
view
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 7bdde99c15c3066dfaac5a1e37b6ee95306e123f..7514aeca86672d849f82019b1c257232f6afba16 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-21,7
+21,9
@@
#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 {
@@
-29,7
+31,7
@@
namespace view {
class TimeMarker;
class View;
class TimeMarker;
class View;
-class Ruler : public
Q
Widget
+class Ruler : public
Margin
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-45,6
+47,11
@@
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);
@@
-53,11
+60,6
@@
private:
void mouseReleaseEvent(QMouseEvent *);
private:
void mouseReleaseEvent(QMouseEvent *);
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.
*/
@@
-67,9
+69,7
@@
private slots:
void hover_point_changed();
private:
void hover_point_changed();
private:
- View &_view;
-
- TimeMarker *_grabbed_marker;
+ boost::weak_ptr<TimeMarker> _grabbed_marker;
};
} // namespace view
};
} // namespace view