X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=54c9c9828e5c52fd691e63e117a2eddd03e6f68b;hp=3e951b339bc261c319e3807249c2a4d91ae35462;hb=32218d3e708553b4508c3510d388aded58068381;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 3e951b33..54c9c982 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,113 +20,130 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
+#include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.hpp>
+
 #include "signal.h"
 #include "view.h"
 
+using std::shared_ptr;
+
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
-const int Signal::LabelHitPadding = 2;
-
-Signal::Signal(QString name) :
-	_name(name)
+const char *const ChannelNames[] = {
+	"CLK",
+	"DATA",
+	"IN",
+	"OUT",
+	"RST",
+	"Tx",
+	"Rx",
+	"EN",
+	"SCLK",
+	"MOSI",
+	"MISO",
+	"/SS",
+	"SDA",
+	"SCL"
+};
+
+Signal::Signal(pv::SigSession &session,
+	std::shared_ptr<sigrok::Channel> channel) :
+	Trace(channel->name().c_str()),
+	_session(session),
+	_channel(channel),
+	_name_widget(NULL),
+	_updating_name_widget(false)
 {
+	assert(_channel);
 }
 
-QString Signal::get_name() const
+void Signal::set_name(QString name)
 {
-	return _name;
+	Trace::set_name(name);
+	_updating_name_widget = true;
+	_name_widget->setEditText(name);
+	_updating_name_widget = false;
 }
 
-void Signal::set_name(QString name)
+bool Signal::enabled() const
 {
-	_name = name;
+	return _channel->enabled();
 }
 
-QColor Signal::get_colour() const
+void Signal::enable(bool enable)
 {
-	return _colour;
+	_channel->set_enabled(enable);
+
+	if (_owner)
+		_owner->extents_changed(true, true);
 }
 
-void Signal::set_colour(QColor colour)
+shared_ptr<Channel> Signal::channel() const
 {
-	_colour = colour;
+	return _channel;
 }
 
-void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	p.setBrush(_colour);
-
-	const QColor colour = get_colour();
-	const float nominal_offset = get_nominal_offset(rect);
-
-	compute_text_size(p);
-	const QRectF label_rect = get_label_rect(rect);
-
-	// Paint the label
-	const QPointF points[] = {
-		label_rect.topLeft(),
-		label_rect.topRight(),
-		QPointF(rect.right(), nominal_offset),
-		label_rect.bottomRight(),
-		label_rect.bottomLeft()
-	};
-
-	const QPointF highlight_points[] = {
-		QPointF(label_rect.left() + 1, label_rect.top() + 1),
-		QPointF(label_rect.right(), label_rect.top() + 1),
-		QPointF(rect.right() - 1, nominal_offset),
-		QPointF(label_rect.right(), label_rect.bottom() - 1),
-		QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
-	};
-
-	p.setPen(Qt::transparent);
-	p.setBrush(hover ? colour.lighter() : colour);
-	p.drawPolygon(points, countof(points));
-
-	p.setPen(colour.lighter());
-	p.setBrush(Qt::transparent);
-	p.drawPolygon(highlight_points, countof(highlight_points));
-
-	p.setPen(colour.darker());
-	p.setBrush(Qt::transparent);
-	p.drawPolygon(points, countof(points));
-
-	// Paint the text
-	p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white);
-	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
+	int index;
+
+	_name_widget = new QComboBox(parent);
+	_name_widget->setEditable(true);
+
+	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+		_name_widget->insertItem(i, ChannelNames[i]);
+
+	index = _name_widget->findText(_name, Qt::MatchExactly);
+
+	if (index == -1) {
+		_name_widget->insertItem(0, _name);
+		_name_widget->setCurrentIndex(0);
+	} else {
+		_name_widget->setCurrentIndex(index);
+	}
+
+	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
+
+	form->addRow(tr("Name"), _name_widget);
+
+	add_colour_option(parent, form);
 }
 
-bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
+QMenu* Signal::create_context_menu(QWidget *parent)
 {
-	const QRectF label = get_label_rect(rect);
-	return QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(rect.right(),
-			label.bottom() + LabelHitPadding)
-		).contains(point);
+	QMenu *const menu = Trace::create_context_menu(parent);
+
+	menu->addSeparator();
+
+	QAction *const disable = new QAction(tr("Disable"), this);
+	disable->setShortcuts(QKeySequence::Delete);
+	connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
+	menu->addAction(disable);
+
+	return menu;
 }
 
-void Signal::compute_text_size(QPainter &p)
+void Signal::delete_pressed()
 {
-	_text_size = p.boundingRect(QRectF(), 0, _name).size();
+	on_disable();
 }
 
-QRectF Signal::get_label_rect(const QRect &rect)
+void Signal::on_disable()
 {
-	using pv::view::View;
-
-	const float nominal_offset = get_nominal_offset(rect) + 0.5;
-	const QSizeF label_size(
-		_text_size.width() + View::LabelPadding.width() * 2,
-		_text_size.height() + View::LabelPadding.height() * 2);
-	const float label_arrow_length = label_size.height() / 2;
-	return QRectF(
-		rect.right() - label_arrow_length -
-			label_size.width() - 0.5,
-		nominal_offset - label_size.height() / 2,
-		label_size.width(), label_size.height());
+	enable(false);
 }
 
 } // namespace view