From 4a5c385ee6a9ce387e0fe908f4d9367aa96d8342 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 7 Dec 2014 11:02:54 +0000 Subject: [PATCH] SelectableItem: Moved in label_rect --- pv/view/rowitem.hpp | 7 ------- pv/view/selectableitem.hpp | 7 +++++++ pv/view/timemarker.hpp | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp index aca4fa83..91c84d35 100644 --- 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; - /** - * 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(); diff --git a/pv/view/selectableitem.hpp b/pv/view/selectableitem.hpp index 29a5c955..b61c54d6 100644 --- a/pv/view/selectableitem.hpp +++ b/pv/view/selectableitem.hpp @@ -88,6 +88,13 @@ public: */ 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. diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp index 4e9d1fa2..38dfa18e 100644 --- a/pv/view/timemarker.hpp +++ b/pv/view/timemarker.hpp @@ -80,16 +80,16 @@ public: 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. -- 2.30.2