X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=cce9f4694e237da6fd7abd8a99b8f2c3f566fc68;hp=aff8c4c427498e54c6eb00dc94dfc05e4c3e4169;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hpb=0c0218fd70bde15f2ccd20f39f6d3ddddd3e1691

diff --git a/pv/view/signal.h b/pv/view/signal.h
index aff8c4c4..cce9f469 100644
--- 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 <memory>
 
 #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,33 +49,39 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(pv::SigSession &session, const sr_probe *const probe);
+	Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const channel);
 
 public:
-	virtual void init_context_bar_actions(QWidget *parent);
-
 	/**
 	 * Sets the name of the signal.
 	 */
 	void set_name(QString name);
 
+	virtual std::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* channel() const;
 
-private:
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private slots:
-	void on_text_changed(const QString &text);
+	QMenu* create_context_menu(QWidget *parent);
+
+	void delete_pressed();
+
+private Q_SLOTS:
+	void on_disable();
 
 protected:
-	const sr_probe *const _probe;
+	std::shared_ptr<pv::device::DevInst> _dev_inst;
+	const sr_channel *const _channel;
 
-	QWidgetAction *_name_action;
 	QComboBox *_name_widget;
 	bool _updating_name_widget;
 };
@@ -77,4 +89,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H