ViewItem: Make hit_box_rect take ViewItemPaintParams

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

diff --git a/pv/view/viewitem.hpp b/pv/view/viewitem.hpp
index 11efbc0cdd1f7bd79855b7fe4c77cc67583f8922..648be84e64384a6fa382a503ee28f0892a480619 100644 (file)
--- a/pv/view/viewitem.hpp
+++ b/pv/view/viewitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEWITEM_H
-#define PULSEVIEW_PV_VIEWITEM_H
+#ifndef PULSEVIEW_PV_VIEWITEM_HPP
+#define PULSEVIEW_PV_VIEWITEM_HPP
 
 #include <list>
 
@@ -39,6 +39,8 @@ class Popup;
 
 namespace view {
 
+class ViewItemOwner;
+
 class ViewItem : public QObject
 {
        Q_OBJECT
@@ -64,18 +66,13 @@ public:
        /**
         * Selects or deselects the signal.
         */
-       void select(bool select = true);
+       virtual void select(bool select = true);
 
        /**
         * Returns true if the item is being dragged.
         */
        bool dragging() const;
 
-       /**
-        * Retunrns the current drag point.
-        */
-       QPoint drag_point() const;
-
        /**
         * Sets this item into the dragged state.
         */
@@ -84,7 +81,13 @@ public:
        /**
         * Sets this item into the un-dragged state.
         */
-       void drag_release();
+       virtual void drag_release();
+
+       /**
+        * Drags the item to a delta relative to the drag point.
+        * @param delta the offset from the drag point.
+        */
+       virtual void drag_by(const QPoint &delta) = 0;
 
        /**
         * Get the drag point.
@@ -96,8 +99,17 @@ public:
         * Computes the outline rectangle of a label.
         * @param rect the rectangle of the header area.
         * @return Returns the rectangle of the signal label.
+        * @remarks The default implementation returns an empty rectangle.
+        */
+       virtual QRectF label_rect(const QRectF &rect) const;
+
+       /**
+        * Computes the outline rectangle of the viewport hit-box.
+        * @param rect the rectangle of the viewport area.
+        * @return Returns the rectangle of the hit-box.
+        * @remarks The default implementation returns an empty hit-box.
         */
-       virtual QRectF label_rect(const QRectF &rect) const = 0;
+       virtual QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
 
        /**
         * Paints the signal label.
@@ -105,7 +117,7 @@ public:
         * @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;
+       virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
        /**
         * Paints the background layer of the item with a QPainter
@@ -140,7 +152,7 @@ public:
 public:
        virtual QMenu* create_context_menu(QWidget *parent);
 
-       virtual pv::widgets::Popup* create_popup(QWidget *parent) = 0;
+       virtual pv::widgets::Popup* create_popup(QWidget *parent);
 
        virtual void delete_pressed();
 
@@ -149,13 +161,13 @@ protected:
 
 protected:
        QWidget *context_parent_;
+       QPoint drag_point_;
 
 private:
        bool selected_;
-       QPoint drag_point_;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWITEM_H
+#endif // PULSEVIEW_PV_VIEWITEM_HPP