X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=67f8dde9c1316c27f17c8830cf234f2285d755d6;hp=08fa54eea55a40392f5d32f73be5eccb9e02e0ec;hb=eee89ff865c28854eebdcecbe344f225b9ee366f;hpb=f32905530347e1020d5ce7959123cf797c9a4829

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 08fa54ee..67f8dde9 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -35,6 +35,7 @@
 #include "view.hpp"
 
 using std::shared_ptr;
+using std::make_shared;
 
 using sigrok::Channel;
 
@@ -63,8 +64,9 @@ Signal::Signal(pv::Session &session,
 	Trace(QString::fromUtf8(channel->name().c_str())),
 	session_(session),
 	channel_(channel),
-	name_widget_(nullptr),
-	updating_name_widget_(false)
+	scale_handle_(make_shared<SignalScaleHandle>(*this)),
+	items_({scale_handle_}),
+	name_widget_(nullptr)
 {
 	assert(channel_);
 }
@@ -72,9 +74,9 @@ Signal::Signal(pv::Session &session,
 void Signal::set_name(QString name)
 {
 	Trace::set_name(name);
-	updating_name_widget_ = true;
-	name_widget_->setEditText(name);
-	updating_name_widget_ = false;
+
+	if (name != name_widget_->currentText())
+		name_widget_->setEditText(name);
 
 	// Store the channel name in sigrok::Channel so that it
 	// will end up in the .sr file upon save.
@@ -99,6 +101,17 @@ shared_ptr<Channel> Signal::channel() const
 	return channel_;
 }
 
+const ViewItemOwner::item_list& Signal::child_items() const
+{
+	return items_;
+}
+
+void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (channel_->enabled())
+		Trace::paint_back(p, pp);
+}
+
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	name_widget_ = new QComboBox(parent);