CursorHeader: Use the same number format as the ruler.

[pulseview.git] / pv / view / ruler.h

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 7bdde99c15c3066dfaac5a1e37b6ee95306e123f..08a9c0e1fdf0128827bbc4c4c016fccd60d8fb2d 100644 (file)
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -21,43 +21,46 @@
 #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.
         */
@@ -65,11 +68,6 @@ private:
 
 private slots:
        void hover_point_changed();
-
-private:
-       View &_view;
-
-       TimeMarker *_grabbed_marker;
 };
 
 } // namespace view