X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.hpp;h=36d87d4594d0a6def78eb2f29daeb1c42408ace4;hp=714b44f6d9d27fcfc4881dc9e4850138f575b0a4;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hpb=214470fc17e73bbf4664f4c1678a7dd30c905bf2

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 714b44f..36d87d4 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -28,18 +28,16 @@
 
 #include <stdint.h>
 
+#include "signalscalehandle.hpp"
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
-namespace sigrok {
-	class Channel;
-}
-
 namespace pv {
 
 class Session;
 
 namespace data {
+class SignalBase;
 class SignalData;
 }
 
@@ -51,13 +49,13 @@ class Signal : public Trace, public ViewItemOwner
 
 protected:
 	Signal(pv::Session &session,
-		std::shared_ptr<sigrok::Channel> channel);
+		std::shared_ptr<data::SignalBase> channel);
 
 public:
 	/**
 	 * Sets the name of the signal.
 	 */
-	void set_name(QString name);
+	virtual void set_name(QString name);
 
 	virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
@@ -68,13 +66,15 @@ public:
 
 	void enable(bool enable = true);
 
-	std::shared_ptr<sigrok::Channel> channel() const;
+	std::shared_ptr<data::SignalBase> channel() const;
 
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
 	const item_list& child_items() const;
 
+	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 	QMenu* create_context_menu(QWidget *parent);
@@ -97,17 +97,18 @@ public:
 	 */
 	virtual void scale_handle_released() {};
 
-private Q_SLOTS:
+protected Q_SLOTS:
+	virtual void on_name_changed(const QString &text);
+
 	void on_disable();
 
 protected:
 	pv::Session &session_;
-	std::shared_ptr<sigrok::Channel> channel_;
 
+	const std::shared_ptr<SignalScaleHandle> scale_handle_;
 	const item_list items_;
 
 	QComboBox *name_widget_;
-	bool updating_name_widget_;
 };
 
 } // namespace view