X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.h;h=dc4e7bb73139530cf870dacb5f06010e7c432050;hb=dd048a7ec035447c051c7937ce04aca5be065b4e;hp=129b70cbe54520d0ccebb2b829a91f3b7211e496;hpb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b;p=pulseview.git

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 129b70cb..dc4e7bb7 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,11 +31,12 @@ namespace view {
 class TimeMarker;
 class View;
 
-class Ruler : public QWidget
+class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
 private:
+	static const int RulerHeight;
 	static const int MinorTickSubdivision;
 	static const int ScaleUnits[3];
 
@@ -45,6 +48,14 @@ private:
 public:
 	Ruler(View &parent);
 
+	void clear_selection();
+
+	static QString format_time(double t, unsigned int prefix,
+		unsigned precision = 0);
+
+public:
+	QSize sizeHint() const;
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -53,8 +64,6 @@ private:
 	void mouseReleaseEvent(QMouseEvent *);
 
 private:
-	void draw_cursors(QPainter &p);
-
 	/**
 	 * Draw a hover arrow under the cursor position.
 	 */
@@ -64,9 +73,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