Removed context bar

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 3a7a103df0ecbae171f6ad47ea67791ba8c48525..540eb6eda38899b3027a9f3a4baac45ecb39b3ba 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,19 +21,14 @@
 #ifndef PULSEVIEW_PV_SIGNAL_H
 #define PULSEVIEW_PV_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
-
-#include <QColor>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QString>
+#include <QComboBox>
+#include <QWidgetAction>
 
 #include <stdint.h>
 
 #include <libsigrok/libsigrok.h>
 
-#include "selectableitem.h"
+#include "trace.h"
 
 namespace pv {
 
@@ -43,132 +38,36 @@ class SignalData;
 
 namespace view {
 
-class Signal : public SelectableItem
+class Signal : public Trace
 {
-private:
-       static const int LabelHitPadding;
-       static const int LabelHighlightRadius;
-
-       static const QPen SignalAxisPen;
+       Q_OBJECT
 
 protected:
-       Signal(const sr_probe *const probe);
+       Signal(pv::SigSession &session, const sr_probe *const probe);
 
 public:
-       /**
-        * Gets the name of this signal.
-        */
-       QString get_name() const;
-
        /**
         * Sets the name of the signal.
         */
        void set_name(QString name);
 
        /**
-        * Get the colour of the signal.
-        */
-       QColor get_colour() const;
-
-       /**
-        * Set the colour of the signal.
-        */
-       void set_colour(QColor colour);
-
-       /**
-        * Gets the vertical layout offset of this signal.
+        * Returns true if the trace is visible and enabled.
         */
-       int get_v_offset() const;
+       bool enabled() const;
 
-       /**
-        * Sets the vertical layout offset of this signal.
-        */
-       void set_v_offset(int v_offset);
-
-       /**
-        * Returns true if the signal has been selected by the user.
-        */
-       bool selected() const;
+       const sr_probe* probe() const;
 
-       /**
-        * Selects or deselects the signal.
-        */
-       void select(bool select = true);
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-       /**
-        * Paints the signal with a QPainter
-        * @param p the QPainter to paint 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, 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 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, int y, int right,
-               bool hover);
-
-       /**
-        * Determines if a point is in the header label rect.
-        * @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(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:
-
-       /**
-        * Computes an caches the size of the label text.
-        */
-       void compute_text_size(QPainter &p);
-
-       /**
-        * Computes the outline rectangle of a label.
-        * @param p the QPainter to lay out text with.
-        * @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(int y, int right);
+private slots:
+       void on_text_changed(const QString &text);
 
 protected:
        const sr_probe *const _probe;
 
-       QString _name;
-       QColor _colour;
-       int _v_offset;
-
-       bool _selected;
-
-       QSizeF _text_size;
+       QComboBox *_name_widget;
+       bool _updating_name_widget;
 };
 
 } // namespace view