MarginWidget: Added item() method

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

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 88df33eadb0bddc74ff00b61774eba65ecdb757c..294946155cc2f20f2737c2452428e293a44e5b17 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -76,11 +76,10 @@ public:
        /**
         * Paints the signal label.
         * @param p the QPainter to paint into.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
+        * @param rect the rectangle of the header area.
         * @param hover true if the label is being hovered over by the mouse.
         */
-       virtual void paint_label(QPainter &p, int right, bool hover);
+       virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
        virtual QMenu* create_context_menu(QWidget *parent);
 
@@ -88,30 +87,19 @@ public:
 
        /**
         * Computes the outline rectangle of a label.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
+        * @param rect the rectangle of the header area.
         * @return Returns the rectangle of the signal label.
         */
-       QRectF label_rect(int right) const;
+       QRectF label_rect(const QRectF &rect) const;
 
 protected:
-
-       /**
-        * Gets the text colour.
-        * @remarks This colour is computed by comparing the lightness
-        * of the trace colour against a threshold to determine whether
-        * white or black would be more visible.
-        */
-       QColor get_text_colour() const;
-
        /**
         * Paints a zero axis across the viewport.
         * @param p the QPainter to paint into.
+        * @param pp the painting parameters object to paint with.
         * @param y the y-offset of the axis.
-        * @param left the x-coordinate of the left edge of the view.
-        * @param right the x-coordinate of the right edge of the view.
         */
-       void paint_axis(QPainter &p, int y, int left, int right);
+       void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
 
        void add_colour_option(QWidget *parent, QFormLayout *form);