ViewItem: Added rect parameter to point()

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

diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index 91c84d352a1dd094a411dc6b44681d020d185e13..3f2afbc3821c9598b04f3d8bf5dbc04e81d72143 100644 (file)
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -25,15 +25,14 @@
 
 #include <QPropertyAnimation>
 
-#include "rowitempaintparams.hpp"
-#include "selectableitem.hpp"
+#include "viewitem.hpp"
 
 namespace pv {
 namespace view {
 
 class RowItemOwner;
 
-class RowItem : public SelectableItem,
+class RowItem : public ViewItem,
        public std::enable_shared_from_this<pv::view::RowItem>
 {
        Q_OBJECT
@@ -95,9 +94,10 @@ public:
        int get_visual_y() const;
 
        /**
-        * Gets the drag point of the row item.
+        * Gets the arrow-tip point of the row item marker.
+        * @param rect the rectangle of the header area.
         */
-       QPoint point() const;
+       QPoint point(const QRect &rect) const;
 
        /**
         * Computes the vertical extents of the contents of this row item.
@@ -105,35 +105,6 @@ public:
         */
        virtual std::pair<int, int> v_extents() const = 0;
 
-       /**
-        * Paints the background layer of the trace with a QPainter
-        * @param p the QPainter to paint into.
-        * @param pp the painting parameters object to paint with.
-        **/
-       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.
-        * @param pp the painting parameters object to paint with.
-        **/
-       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.
-        * @param pp the painting parameters object to paint with.
-        **/
-       virtual void paint_fore(QPainter &p, const RowItemPaintParams &pp);
-
-       /**
-        * Paints the signal label.
-        * @param p the QPainter to paint into.
-        * @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, const QRect &rect, bool hover) = 0;
-
 public:
        virtual void hover_point_changed();