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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ecf74f08..67f8dde9 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;
 
@@ -47,8 +48,8 @@ const char *const ChannelNames[] = {
 	"IN",
 	"OUT",
 	"RST",
-	"Tx",
-	"Rx",
+	"TX",
+	"RX",
 	"EN",
 	"SCLK",
 	"MOSI",
@@ -60,11 +61,12 @@ const char *const ChannelNames[] = {
 
 Signal::Signal(pv::Session &session,
 	std::shared_ptr<sigrok::Channel> channel) :
-	Trace(channel->name().c_str()),
+	Trace(QString::fromUtf8(channel->name().c_str())),
 	session_(session),
 	channel_(channel),
-	name_widget_(NULL),
-	updating_name_widget_(false)
+	scale_handle_(make_shared<SignalScaleHandle>(*this)),
+	items_({scale_handle_}),
+	name_widget_(nullptr)
 {
 	assert(channel_);
 }
@@ -72,13 +74,13 @@ 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.
-	channel_->set_name(name.toStdString());
+	channel_->set_name(name.toUtf8().constData());
 }
 
 bool Signal::enabled() const
@@ -99,17 +101,27 @@ 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
+{
+	return items_;
+}
+
+void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-	int index;
+	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);
 
-	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_);