X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=7028b29e9fb31cdc182b5396ba2e7fa7f9ba75b8;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=cdecd408a9f9c45e6de3f29f4a18004ff51db828;hpb=68456dab5d519d886cf632cecc01373cc258d83c;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index cdecd40..7028b29 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,18 +18,22 @@
  * 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"
 
+namespace sigrok {
+	class Channel;
+}
+
 namespace pv {
 
 namespace data {
@@ -43,7 +47,7 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(pv::SigSession &session, const sr_probe *const probe);
+	Signal(std::shared_ptr<sigrok::Channel> channel);
 
 public:
 	/**
@@ -51,17 +55,28 @@ public:
 	 */
 	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);
+
+	std::shared_ptr<sigrok::Channel> channel() const;
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
+	QMenu* create_context_menu(QWidget *parent);
+
+	void delete_pressed();
+
+private Q_SLOTS:
+	void on_disable();
+
 protected:
-	const sr_probe *const _probe;
+	std::shared_ptr<sigrok::Channel> _channel;
 
 	QComboBox *_name_widget;
 	bool _updating_name_widget;
@@ -70,4 +85,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H