X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=5cd5b183590af45dcd783dd948f3a0d81af84582;hp=9f97d5bca7194562f40d4939b77e47f46e19502b;hb=8c09273b13a10399e7f7d18dd446c2d13813e239;hpb=0771cc94a8487f1510d0a6751538a39652e9897f

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 9f97d5bc..5cd5b183 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,13 +101,24 @@ 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);
 	name_widget_->setEditable(true);
-	name_widget_->setCompleter(0);
+	name_widget_->setCompleter(nullptr);
 
-	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+	for (unsigned int i = 0; i < countof(ChannelNames); i++)
 		name_widget_->insertItem(i, ChannelNames[i]);
 
 	const int index = name_widget_->findText(name_, Qt::MatchExactly);