projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::shared_ptr with std::shared_ptr
[pulseview.git]
/
pv
/
view
/
ruler.h
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 7514aeca86672d849f82019b1c257232f6afba16..e7575db1d534fe8a37af3cde9f8f4f08ddef019b 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-21,7
+21,7
@@
#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 <
memory
>
#include "marginwidget.h"
#include "marginwidget.h"
@@
-36,12
+36,10
@@
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:
static const int HoverArrowSize;
public:
@@
-49,8
+47,8
@@
public:
void clear_selection();
void clear_selection();
- static QString format_time(double t, unsigned int prefix,
-
unsigned precision = 0)
;
+public:
+
QSize sizeHint() const
;
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
@@
-69,7
+67,9
@@
private slots:
void hover_point_changed();
private:
void hover_point_changed();
private:
- boost::weak_ptr<TimeMarker> _grabbed_marker;
+ std::weak_ptr<TimeMarker> _grabbed_marker;
+ QPoint _mouse_down_point;
+ bool _dragging;
};
} // namespace view
};
} // namespace view