Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 677f366b477f7b1caaaae3bfb03a523ff3a51a0d..9f0ecd44c2a54ca82706775887db0e453792c6fa 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -31,6 +31,8 @@
 
 #include "tracetreeitem.hpp"
 
+#include "pv/data/signalbase.hpp"
+
 class QFormLayout;
 
 namespace pv {
@@ -39,7 +41,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -49,36 +52,27 @@ private:
        static const QPen AxisPen;
        static const int LabelHitPadding;
 
+       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);
 
        /**
-        * 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.
+        * Enables or disables the coloured background for this trace.
         */
-       QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+       void set_coloured_bg(bool state);
 
        /**
         * Paints the signal label.
@@ -100,6 +94,13 @@ public:
        QRectF label_rect(const QRectF &rect) const;
 
 protected:
+       /**
+        * Paints the background layer of the signal 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 ViewItemPaintParams &pp);
+
        /**
         * Paints a zero axis across the viewport.
         * @param p the QPainter to paint into.
@@ -114,23 +115,29 @@ 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_;
+       std::shared_ptr<data::SignalBase> base_;
+       bool coloured_bg_, coloured_bg_state_;
 
 private:
        pv::widgets::Popup *popup_;
        QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP