Rename 'probe' to 'channel' (libsigrokdecode change).

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 540eb6eda38899b3027a9f3a4baac45ecb39b3ba..32d181772fce2ce2c48e571d50573608e7d6018f 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,24 +18,30 @@
  * 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 <QWidgetAction>
 
 #include <stdint.h>
 
-#include <libsigrok/libsigrok.h>
-
 #include "trace.h"
 
+struct sr_channel;
+
 namespace pv {
 
 namespace data {
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 
 class Signal : public Trace
@@ -43,7 +49,8 @@ class Signal : public Trace
        Q_OBJECT
 
 protected:
-       Signal(pv::SigSession &session, const sr_probe *const probe);
+       Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel *const probe);
 
 public:
        /**
@@ -51,20 +58,29 @@ public:
         */
        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;
 
-       const sr_probe* probe() const;
+       void enable(bool enable = true);
+
+       const sr_channel* 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:
-       const sr_probe *const _probe;
+       boost::shared_ptr<pv::device::DevInst> _dev_inst;
+       const sr_channel *const _probe;
 
        QComboBox *_name_widget;
        bool _updating_name_widget;
@@ -73,4 +89,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H