RowItem: Pass rect into label_rect

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

diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index d6233e8ce58fb3dbe57f024ade9f9bc14a1ec678..aca4fa83ecbb24bc4f372f25311e643b9a14c13c 100644 (file)
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -25,6 +25,7 @@
 
 #include <QPropertyAnimation>
 
 
 #include <QPropertyAnimation>
 

+#include "rowitempaintparams.hpp"

 #include "selectableitem.hpp"
 
 namespace pv {
 #include "selectableitem.hpp"
 
 namespace pv {


@@ -46,11 +47,6 @@ public:
         */
        RowItem();
 
         */
        RowItem();
 

-       /**
-        * Returns true if the item is visible and enabled.
-        */
-       virtual bool enabled() const = 0;
-

        /**
         * Gets the vertical layout offset of this signal.
         */
        /**
         * Gets the vertical layout offset of this signal.
         */


@@ -112,43 +108,38 @@ public:
        /**
         * Paints the background layer of the trace with a QPainter
         * @param p the QPainter to paint into.
        /**
         * Paints the background layer of the trace with a QPainter
         * @param p the QPainter to paint into.

-        * @param left the x-coordinate of the left edge of the signal
-        * @param right the x-coordinate of the right edge of the signal
+        * @param pp the painting parameters object to paint with.

         **/
         **/

-       virtual void paint_back(QPainter &p, int left, int right);
+       virtual void paint_back(QPainter &p, const RowItemPaintParams &pp);

 
        /**
         * Paints the mid-layer of the trace with a QPainter
         * @param p the QPainter to paint into.
 
        /**
         * Paints the mid-layer of the trace with a QPainter
         * @param p the QPainter to paint into.

-        * @param left the x-coordinate of the left edge of the signal
-        * @param right the x-coordinate of the right edge of the signal
+        * @param pp the painting parameters object to paint with.

         **/
         **/

-       virtual void paint_mid(QPainter &p, int left, int right);
+       virtual void paint_mid(QPainter &p, const RowItemPaintParams &pp);

 
        /**
         * Paints the foreground layer of the trace with a QPainter
         * @param p the QPainter to paint into.
 
        /**
         * Paints the foreground layer of the trace with a QPainter
         * @param p the QPainter to paint into.

-        * @param left the x-coordinate of the left edge of the signal
-        * @param right the x-coordinate of the right edge of the signal
+        * @param pp the painting parameters object to paint with.

         **/
         **/

-       virtual void paint_fore(QPainter &p, int left, int right);
+       virtual void paint_fore(QPainter &p, const RowItemPaintParams &pp);

 
        /**
         * Paints the signal label.
         * @param p the QPainter to paint into.
 
        /**
         * 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.
         */
         * @param hover true if the label is being hovered over by the mouse.
         */

-       virtual void paint_label(QPainter &p, int right, bool hover) = 0;
+       virtual void paint_label(QPainter &p, const QRect &rect, bool hover) = 0;

 
        /**
         * Computes the outline rectangle of a label.
 
        /**
         * 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.
         */
         * @return Returns the rectangle of the signal label.
         */

-       virtual QRectF label_rect(int right) const = 0;
+       virtual QRectF label_rect(const QRectF &rect) const = 0;

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