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

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 7bdde99c..00fac244 100644
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -21,55 +21,53 @@
 #ifndef PULSEVIEW_PV_VIEW_RULER_H
 #define PULSEVIEW_PV_VIEW_RULER_H
 
-#include <QWidget>
+#include <memory>
+
+#include "marginwidget.h"
 
 namespace pv {
 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);
 
-private:
-	void paintEvent(QPaintEvent *event);
+	/**
+	 * Find a tick spacing and number formatting that does not cause
+	 * the values to collide.
+	 * @param p A QPainter used to determine the needed space for the values.
+	 * @param scale A pv::view::View's scale.
+	 * @param offset A pv::view::View's offset.
+	 *
+	 * @return The tick period to use in 'first' and the prefix in 'second'.
+	 */
+	static std::pair<double, unsigned int> calculate_tick_spacing(
+		QPainter& p, double scale, double offset);
 
-	void mouseMoveEvent(QMouseEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-	void mouseReleaseEvent(QMouseEvent *);
+public:
+	QSize sizeHint() const;
 
 private:
-	static QString format_time(double t, double multiplier,
-		unsigned int prefix);
-
-	void draw_cursors(QPainter &p);
+	void paintEvent(QPaintEvent *event);
 
+private:
 	/**
 	 * Draw a hover arrow under the cursor position.
 	 */
 	void draw_hover_mark(QPainter &p);
 
-private slots:
+private Q_SLOTS:
 	void hover_point_changed();
-
-private:
-	View &_view;
-
-	TimeMarker *_grabbed_marker;
 };
 
 } // namespace view