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
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 461ec05cfbd0e7ef97bb44de2ca0f579543b0424..6f77cb4d9aa89e9f7463966bc92227a26f1b2f08 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-21,6
+21,8
@@
#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 <boost/weak_ptr.hpp>
+
#include "marginwidget.h"
namespace pv {
#include "marginwidget.h"
namespace pv {
@@
-45,6
+47,8
@@
private:
public:
Ruler(View &parent);
public:
Ruler(View &parent);
+ void clear_selection();
+
static QString format_time(double t, unsigned int prefix,
unsigned precision = 0);
static QString format_time(double t, unsigned int prefix,
unsigned precision = 0);
@@
-65,7
+69,9
@@
private slots:
void hover_point_changed();
private:
void hover_point_changed();
private:
- TimeMarker *_grabbed_marker;
+ boost::weak_ptr<TimeMarker> _grabbed_marker;
+ QPoint _mouse_down_point;
+ bool _dragging;
};
} // namespace view
};
} // namespace view