SelectableItem: Moved in label_rect

diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index aca4fa83ecbb24bc4f372f25311e643b9a14c13c..91c84d352a1dd094a411dc6b44681d020d185e13 100644 (file)
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -134,13 +134,6 @@ public:
         */
        virtual void paint_label(QPainter &p, const QRect &rect, bool hover) = 0;
 
         */
        virtual void paint_label(QPainter &p, const QRect &rect, bool hover) = 0;
 

-       /**
-        * Computes the outline rectangle of a label.
-        * @param rect the rectangle of the header area.
-        * @return Returns the rectangle of the signal label.
-        */
-       virtual QRectF label_rect(const QRectF &rect) const = 0;
-

 public:
        virtual void hover_point_changed();
 
 public:
        virtual void hover_point_changed();
 

diff --git a/pv/view/selectableitem.hpp b/pv/view/selectableitem.hpp
index 29a5c9557973b852504e4a1ff7d7ca7bdcdad80e..b61c54d6430bebd04c575a2ee3e101285e9ee34e 100644 (file)
--- a/pv/view/selectableitem.hpp
+++ b/pv/view/selectableitem.hpp
@@ -88,6 +88,13 @@ public:
         */
        virtual QPoint point() const = 0;
 
         */
        virtual QPoint point() const = 0;
 

+       /**
+        * Computes the outline rectangle of a label.
+        * @param rect the rectangle of the header area.
+        * @return Returns the rectangle of the signal label.
+        */
+       virtual QRectF label_rect(const QRectF &rect) const = 0;
+

 public:
        /**
         * Gets the text colour.
 public:
        /**
         * Gets the text colour.

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 4e9d1fa2ebf5158842b6314e0b906da5c318c6d7..38dfa18e61d69a6b1e679c8ffd1b1498bbf22231 100644 (file)
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -80,16 +80,16 @@ public:
        virtual void paint(QPainter &p, const QRect &rect);
 
        /**
        virtual void paint(QPainter &p, const QRect &rect);
 
        /**

-        * Gets the text to show in the marker.
+        * Computes the outline rectangle of a label.
+        * @param rect the rectangle of the header area.
+        * @return Returns the rectangle of the signal label.

         */
         */

-       virtual QString get_text() const = 0;
+       QRectF label_rect(const QRectF &rect) const;

 
        /**
 
        /**

-        * Gets the marker label rectangle.
-        * @param rect The rectangle of the ruler client area.
-        * @return Returns the label rectangle.
+        * Gets the text to show in the marker.

         */
         */

-       virtual QRectF label_rect(const QRectF &rect) const;
+       virtual QString get_text() const = 0;

 
        /**
         * Paints the marker's label to the ruler.
 
        /**
         * Paints the marker's label to the ruler.