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

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 7bdde99c..c48f25a0 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,22 +31,25 @@ 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];
 
-	static const QString SIPrefixes[9];
-	static const int FirstSIPrefixPower;
-
 	static const int HoverArrowSize;
 
 public:
 	Ruler(View &parent);
 
+	void clear_selection();
+
+public:
+	QSize sizeHint() const;
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -53,11 +58,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 +67,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