Moved all sr_probe modification into pv::DevInst

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index ea336434f4ae5e7df9d39bfa61b610d067bd93f2..25b671f4217af8e71b0b5a8314849ae31bf79a9a 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,21 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
+
+#include <boost/shared_ptr.hpp>
 
 #include <QComboBox>
-#include <QPen>
 #include <QWidgetAction>
 
 #include <stdint.h>
 
-#include <libsigrok/libsigrok.h>
-
 #include "trace.h"
 
+struct sr_probe;
+
 namespace pv {
 
+class DevInst;
+
 namespace data {
 class SignalData;
 }
@@ -43,43 +46,40 @@ class Signal : public Trace
 {
        Q_OBJECT
 
-private:
-       static const QPen SignalAxisPen;
-
 protected:
-       Signal(pv::SigSession &session, const sr_probe *const probe);
+       Signal(boost::shared_ptr<pv::DevInst> dev_inst,
+               const sr_probe *const probe);
 
 public:
-       virtual void init_context_bar_actions(QWidget *parent);
-
        /**
         * Sets the name of the signal.
         */
        void set_name(QString name);
 
+       virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+
        /**
         * Returns true if the trace is visible and enabled.
         */
        bool enabled() const;
 
-protected:
+       void enable(bool enable = true);
 
-       /**
-        * 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);
+       const sr_probe* probe() const;
+
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+       QMenu* create_context_menu(QWidget *parent);
+
+       void delete_pressed();
 
 private slots:
-       void on_text_changed(const QString &text);
+       void on_disable();
 
 protected:
+       boost::shared_ptr<pv::DevInst> _dev_inst;
        const sr_probe *const _probe;
 
-       QWidgetAction *_name_action;
        QComboBox *_name_widget;
        bool _updating_name_widget;
 };
@@ -87,4 +87,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H