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

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 1381502d..00fac244 100644
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -21,45 +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 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);
 
+	/**
+	 * 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);
+
+public:
+	QSize sizeHint() const;
+
 private:
 	void paintEvent(QPaintEvent *event);
 
 private:
-	void draw_cursors(QPainter &p);
-
 	/**
 	 * 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;
 };
 
 } // namespace view