X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=47e91f4b9a67f9a904d0b059e3da5cee543a35ab;hp=dad8f1edc6f106af051b82665b14350ab1542a08;hb=f1626bb80080435e306c9a6c5d6ff20dd6dc9e57;hpb=f69678269730c1e0ee8319fba774a98043fec0e8

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index dad8f1ed..47e91f4b 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -29,12 +29,13 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "signal.hpp"
 #include "view.hpp"
 
 using std::shared_ptr;
+using std::make_shared;
 
 using sigrok::Channel;
 
@@ -63,7 +64,9 @@ Signal::Signal(pv::Session &session,
 	Trace(QString::fromUtf8(channel->name().c_str())),
 	session_(session),
 	channel_(channel),
-	name_widget_(NULL),
+	scale_handle_(make_shared<SignalScaleHandle>(*this)),
+	items_({scale_handle_}),
+	name_widget_(nullptr),
 	updating_name_widget_(false)
 {
 	assert(channel_);
@@ -99,17 +102,21 @@ shared_ptr<Channel> Signal::channel() const
 	return channel_;
 }
 
-void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+const ViewItemOwner::item_list& Signal::child_items() const
 {
-	int index;
+	return items_;
+}
 
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
 	name_widget_ = new QComboBox(parent);
 	name_widget_->setEditable(true);
+	name_widget_->setCompleter(0);
 
-	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+	for (unsigned int i = 0; i < countof(ChannelNames); i++)
 		name_widget_->insertItem(i, ChannelNames[i]);
 
-	index = name_widget_->findText(name_, Qt::MatchExactly);
+	const int index = name_widget_->findText(name_, Qt::MatchExactly);
 
 	if (index == -1) {
 		name_widget_->insertItem(0, name_);