Moved highlight pen into SelectableItem

[pulseview.git] / pv / view / signal.h

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 72019032e06a74e221f92c4d9ea0ddf57fa968e6..ece2e5a446218591f066a435454004a550b267f3 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -25,11 +25,16 @@
 
 #include <QColor>
 #include <QPainter>
+#include <QPen>
 #include <QRect>
 #include <QString>
 
 #include <stdint.h>
 
+#include <libsigrok/libsigrok.h>
+
+#include "selectableitem.h"
+
 namespace pv {
 
 namespace data {
@@ -38,14 +43,17 @@ class SignalData;
 
 namespace view {
 
-class Signal
+class Signal : public SelectableItem
 {
+       Q_OBJECT
+
 private:
        static const int LabelHitPadding;
-       static const int LabelHighlightRadius;
+
+       static const QPen SignalAxisPen;
 
 protected:
-       Signal(QString name);
+       Signal(const sr_probe *const probe);
 
 public:
        /**
@@ -78,43 +86,52 @@ public:
         */
        void set_v_offset(int v_offset);
 
-       /**
-        * Returns true if the signal has been selected by the user.
-        */
-       bool selected() const;
-
-       /**
-        * Selects or deselects the signal.
-        */
-       void select(bool select = true);
-
        /**
         * Paints the signal with a QPainter
         * @param p the QPainter to paint into.
-        * @param rect the rectangular area to draw the trace into.
+        * @param y the y-coordinate to draw the signal at
+        * @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 scale the scale in seconds per pixel.
         * @param offset the time to show at the left hand edge of
         *   the view in seconds.
         **/
-       virtual void paint(QPainter &p, const QRect &rect, double scale,
-               double offset) = 0;
-
+       virtual void paint(QPainter &p, int y, int left, int right,
+               double scale, double offset) = 0;
 
        /**
         * Paints the signal label into a QGLWidget.
         * @param p the QPainter to paint into.
-        * @param rect the rectangular area to draw the label into.
+        * @param y the y-coordinate of the signal.
+        * @param right the x-coordinate of the right edge 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,
+       virtual void paint_label(QPainter &p, int y, int right,
                bool hover);
 
        /**
         * Determines if a point is in the header label rect.
-        * @param rect the rectangular area to draw the label into.
+        * @param y the y-coordinate of the signal.
+        * @param left the x-coordinate of the left edge of the header
+        *      area.
+        * @param right the x-coordinate of the right edge of the header
+        *      area.
         * @param point the point to test.
         */
-       bool pt_in_label_rect(const QRect &rect, const QPoint &point);
+       bool pt_in_label_rect(int y, int left, int right,
+               const QPoint &point);
+
+protected:
+
+       /**
+        * Paints a zero axis across the viewport.
+        * @param p the QPainter to paint into.
+        * @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);
 
 private:
 
@@ -126,25 +143,20 @@ private:
        /**
         * Computes the outline rectangle of a label.
         * @param p the QPainter to lay out text with.
-        * @param rect The rectangle of the signal header.
+        * @param y the y-coordinate of the signal.
+        * @param right the x-coordinate of the right edge of the header
+        *      area.
         * @return Returns the rectangle of the signal label.
         */
-       QRectF get_label_rect(const QRect &rect);
+       QRectF get_label_rect(int y, int right);
 
 protected:
-       /**
-        * When painting into the rectangle, calculate the y
-        * offset of the zero point.
-        **/
-       virtual int get_nominal_offset(const QRect &rect) const = 0;
+       const sr_probe *const _probe;
 
-protected:
        QString _name;
        QColor _colour;
        int _v_offset;
 
-       bool _selected;
-
        QSizeF _text_size;
 };