X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=51af899ee4d814d8703e92c33ebfe135142cd6ad;hp=2469d981632b59d9f8eaadb0b8cc2248d41e831c;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hpb=2658961bdef3601e07d494a8ed3d01a8101b68cd

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 2469d981..51af899e 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,143 +20,131 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
 #include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.h>
 
 #include "signal.h"
 #include "view.h"
 
-namespace pv {
-namespace view {
+#include <pv/device/devinst.h>
 
-const int Signal::LabelHitPadding = 2;
-const int Signal::LabelHighlightRadius = 6;
+using std::shared_ptr;
 
-Signal::Signal(QString name) :
-	_name(name),
-	_v_offset(0),
-	_selected(false)
-{
-}
+namespace pv {
+namespace view {
 
-QString Signal::get_name() const
+const char *const ChannelNames[] = {
+	"CLK",
+	"DATA",
+	"IN",
+	"OUT",
+	"RST",
+	"Tx",
+	"Rx",
+	"EN",
+	"SCLK",
+	"MOSI",
+	"MISO",
+	"/SS",
+	"SDA",
+	"SCL"
+};
+
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const channel) :
+	Trace(channel->name),
+	_dev_inst(dev_inst),
+	_channel(channel),
+	_name_widget(NULL),
+	_updating_name_widget(false)
 {
-	return _name;
+	assert(_channel);
 }
 
 void Signal::set_name(QString name)
 {
-	_name = name;
+	Trace::set_name(name);
+	_updating_name_widget = true;
+	_name_widget->setEditText(name);
+	_updating_name_widget = false;
 }
 
-QColor Signal::get_colour() const
+bool Signal::enabled() const
 {
-	return _colour;
+	return _channel->enabled;
 }
 
-void Signal::set_colour(QColor colour)
+void Signal::enable(bool enable)
 {
-	_colour = colour;
+	_dev_inst->enable_channel(_channel, enable);
+	visibility_changed();
 }
 
-int Signal::get_v_offset() const
+const sr_channel* Signal::channel() const
 {
-	return _v_offset;
+	return _channel;
 }
 
-void Signal::set_v_offset(int v_offset)
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	_v_offset = v_offset;
-}
+	int index;
 
-bool Signal::selected() const
-{
-	return _selected;
-}
+	_name_widget = new QComboBox(parent);
+	_name_widget->setEditable(true);
 
-void Signal::select(bool select)
-{
-	_selected = select;
-}
+	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+		_name_widget->insertItem(i, ChannelNames[i]);
 
-void Signal::paint_label(QPainter &p, int y, int right, bool hover)
-{
-	p.setBrush(_colour);
-
-	const QColor colour = get_colour();
-
-	compute_text_size(p);
-	const QRectF label_rect = get_label_rect(y, right);
-
-	// Paint the label
-	const QPointF points[] = {
-		label_rect.topLeft(),
-		label_rect.topRight(),
-		QPointF(right, y),
-		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(right - 1, y),
-		QPointF(label_rect.right(), label_rect.bottom() - 1),
-		QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
-	};
-
-	if (_selected) {
-		p.setPen(QPen(QApplication::palette().brush(
-			QPalette::Highlight), LabelHighlightRadius,
-			Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
+	index = _name_widget->findText(_name, Qt::MatchExactly);
+
+	if (index == -1) {
+		_name_widget->insertItem(0, _name);
+		_name_widget->setCurrentIndex(0);
+	} else {
+		_name_widget->setCurrentIndex(index);
 	}
 
-	p.setPen(Qt::transparent);
-	p.setBrush(hover ? colour.lighter() : colour);
-	p.drawPolygon(points, countof(points));
+	_name_widget->lineEdit()->selectAll();
+	_name_widget->setFocus();
 
-	p.setPen(colour.lighter());
-	p.setBrush(Qt::transparent);
-	p.drawPolygon(highlight_points, countof(highlight_points));
+	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
 
-	p.setPen(colour.darker());
-	p.setBrush(Qt::transparent);
-	p.drawPolygon(points, countof(points));
+	form->addRow(tr("Name"), _name_widget);
 
-	// Paint the text
-	p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white);
-	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
+	add_colour_option(parent, form);
 }
 
-bool Signal::pt_in_label_rect(int y, int left, int right,
-	const QPoint &point)
+QMenu* Signal::create_context_menu(QWidget *parent)
 {
-	const QRectF label = get_label_rect(y, right);
-	return QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(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(int y, int right)
+void Signal::on_disable()
 {
-	using pv::view::View;
-
-	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(
-		right - label_arrow_length - label_size.width() - 0.5,
-		y + 0.5f - label_size.height() / 2,
-		label_size.width(), label_size.height());
+	enable(false);
 }
 
 } // namespace view