X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.h;h=6f77cb4d9aa89e9f7463966bc92227a26f1b2f08;hp=7bdde99c15c3066dfaac5a1e37b6ee95306e123f;hb=b213ef0991a13af0c74ffe5c54382c5c455c5496;hpb=3f509c1f40fa91f3bf4468b648cdb01bc45b0cb8

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 7bdde99c..6f77cb4d 100644
--- 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
 
-#include <QWidget>
+#include <boost/weak_ptr.hpp>
+
+#include "marginwidget.h"
 
 namespace pv {
 namespace view {
@@ -29,7 +31,7 @@ namespace view {
 class TimeMarker;
 class View;
 
-class Ruler : public QWidget
+class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
@@ -45,6 +47,11 @@ private:
 public:
 	Ruler(View &parent);
 
+	void clear_selection();
+
+	static QString format_time(double t, unsigned int prefix,
+		unsigned precision = 0);
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -53,11 +60,6 @@ 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.
 	 */
@@ -67,9 +69,9 @@ private slots:
 	void hover_point_changed();
 
 private:
-	View &_view;
-
-	TimeMarker *_grabbed_marker;
+	boost::weak_ptr<TimeMarker> _grabbed_marker;
+	QPoint _mouse_down_point;
+	bool _dragging;
 };
 
 } // namespace view