Ruler: Removed BaselineOffset

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

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index 438b862c53440c12d41e3f8fce33c76d6e98c05a..f9409449b90887502223d385ab002886f2708489 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -28,43 +28,64 @@
 namespace pv {
 namespace view {
 
+class TimeItem;
+
 class Ruler : public MarginWidget
 {
        Q_OBJECT
 
 private:
-       static const int RulerHeight;
+
+       /// Height of the ruler in multipes of the text height
+       static const float RulerHeight;
+
        static const int MinorTickSubdivision;
-       static const int ScaleUnits[3];
 
-       static const int HoverArrowSize;
+       /// Height of the hover arrow in multiples of the text height
+       static const float HoverArrowSize;
+
+       static const int Padding;
 
 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:
+       void clear_selection();
 
 public:
        QSize sizeHint() const;
 
+       /**
+        * The extended area that the header widget would like to be sized to.
+        * @remarks This area is the area specified by sizeHint, extended by
+        * the area to overlap the viewport.
+        */
+       QSize extended_size_hint() const;
+
 private:
        void paintEvent(QPaintEvent *event);
 
+       void mouseMoveEvent(QMouseEvent *e);
+       void mousePressEvent(QMouseEvent *e);
+       void mouseReleaseEvent(QMouseEvent *);
+       void leaveEvent(QEvent*);
+
+       void mouseDoubleClickEvent(QMouseEvent *e);
+
+       void keyPressEvent(QKeyEvent *e);
+
 private:
        /**
         * Draw a hover arrow under the cursor position.
+        * @param p The painter to draw into.
+        * @param text_height The height of a single text ascent.
         */
-       void draw_hover_mark(QPainter &p);
+       void draw_hover_mark(QPainter &p, int text_height);
+
+       int calculate_text_height() const;
+
+private:
+       std::shared_ptr<TimeItem> mouse_down_item_;
 
 private Q_SLOTS:
        void hover_point_changed();