MarginWidget: Moved in clear_selection

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

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index e47c424ae6b53168535a37d6cfe68a835e6de0a4..ce9cae30134c0af64fb14ed97ff6ae48c208eb0d 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -29,31 +29,25 @@ namespace pv {
 namespace view {
 
 class TimeItem;
+class ViewItem;
 
 class Ruler : public MarginWidget
 {
        Q_OBJECT
 
 private:
-       static const int RulerHeight;
-       static const int MinorTickSubdivision;
 
-       static const int HoverArrowSize;
+       /// Height of the ruler in multipes of the text height
+       static const float RulerHeight;
 
-       static const int Padding;
+       static const int MinorTickSubdivision;
 
-       /**
-        * The vertical offset, relative to the bottom line of the widget,
-        * where the arrows of the cursor labels end.
-        */
-       static const int BaselineOffset;
+       /// Height of the hover arrow in multiples of the text height
+       static const float HoverArrowSize;
 
 public:
        Ruler(View &parent);
 
-public:
-       void clear_selection();
-
 public:
        QSize sizeHint() const;
 
@@ -64,13 +58,27 @@ public:
         */
        QSize extended_size_hint() const;
 
+private:
+       /**
+        * Gets the time items.
+        */
+       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+
+       /**
+        * Gets the first view item which has a label that contains @c pt .
+        * @param pt the point to search with.
+        * @return the view item that has been found, or and empty
+        *   @c shared_ptr if no item was found.
+        */
+       std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
+               const QPoint &pt);
+
 private:
        void paintEvent(QPaintEvent *event);
 
        void mouseMoveEvent(QMouseEvent *e);
        void mousePressEvent(QMouseEvent *e);
        void mouseReleaseEvent(QMouseEvent *);
-       void leaveEvent(QEvent*);
 
        void mouseDoubleClickEvent(QMouseEvent *e);
 
@@ -79,14 +87,12 @@ private:
 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);
-
-       int calculate_text_height();
+       void draw_hover_mark(QPainter &p, int text_height);
 
-private:
-       std::shared_ptr<TimeItem> mouse_down_item_;
-       const int text_height_;
+       int calculate_text_height() const;
 
 private Q_SLOTS:
        void hover_point_changed();