Rename Trace::channel_ to Trace::base_, including dependencies

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

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index acaa341adbadd55f477e32d1f3e01d9cd4c662f6..0a6735f59d0787539fec1ef1cdac4e5eb91c645c 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -31,6 +31,8 @@
 
 #include "tracetreeitem.hpp"
 
+#include "pv/data/signalbase.hpp"
+
 class QFormLayout;
 
 namespace pv {
@@ -49,50 +51,28 @@ private:
        static const QPen AxisPen;
        static const int LabelHitPadding;
 
-       static const QColor BrightBGColour;
-       static const QColor DarkBGColour;
+       static const QColor BrightGrayBGColour;
+       static const QColor DarkGrayBGColour;
 
 protected:
-       Trace(QString name);
+       Trace(std::shared_ptr<data::SignalBase> channel);
 
 public:
-       /**
-        * Gets the name of this signal.
-        */
-       QString name() const;
-
        /**
         * Sets the name of the signal.
         */
        virtual void set_name(QString name);
 
-       /**
-        * Get the colour of the signal.
-        */
-       QColor colour() const;
-
        /**
         * Set the colour of the signal.
         */
-       void set_colour(QColor colour);
+       virtual void set_colour(QColor colour);
 
        /**
         * Enables or disables the coloured background for this trace.
         */
        void set_coloured_bg(bool state);
 
-       /**
-        * Returns true if the item may be dragged/moved.
-        */
-       bool is_draggable() 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.
-        */
-       QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
-
        /**
         * Paints the signal label.
         * @param p the QPainter to paint into.
@@ -134,16 +114,20 @@ protected:
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private Q_SLOTS:
-       void on_text_changed(const QString &text);
+protected Q_SLOTS:
+       virtual void on_name_changed(const QString &text);
 
-       void on_colour_changed(const QColor &colour);
+       virtual void on_colour_changed(const QColor &colour);
 
        void on_popup_closed();
 
+private Q_SLOTS:
+       void on_nameedit_changed(const QString &name);
+
+       void on_colouredit_changed(const QColor &colour);
+
 protected:
-       QString name_;
-       QColor colour_, bgcolour_;
+       std::shared_ptr<data::SignalBase> base_;
        bool coloured_bg_, coloured_bg_state_;
 
 private: