X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=1f00477a2012d9cb5a3a8e11f6cd046ff62f8682;hp=ae180e19a47a228a35f8d1151658b3f1b14973c2;hb=b213ef0991a13af0c74ffe5c54382c5c455c5496;hpb=d09674d4529828b6bd2cbaa027949b953d6bd96a

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ae180e19..1f00477a 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,6 +24,8 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
 
 #include "signal.h"
 #include "view.h"
@@ -31,138 +33,95 @@
 namespace pv {
 namespace view {
 
-const int Signal::LabelHitPadding = 2;
-
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
-Signal::Signal(const sr_probe *const probe) :
+const char *const ProbeNames[] = {
+	"CLK",
+	"DATA",
+	"IN",
+	"OUT",
+	"RST",
+	"Tx",
+	"Rx",
+	"EN",
+	"SCLK",
+	"MOSI",
+	"MISO",
+	"/SS",
+	"SDA",
+	"SCL"
+};
+
+Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
+	Trace(session, probe->name),
 	_probe(probe),
-	_name(probe->name),
-	_v_offset(0)
+	_name_widget(NULL),
+	_updating_name_widget(false)
 {
 	assert(_probe);
 }
 
-QString Signal::get_name() const
-{
-	return _name;
-}
-
 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 _probe->enabled;
 }
 
-void Signal::set_colour(QColor colour)
+void Signal::enable(bool enable)
 {
-	_colour = colour;
+	_probe->enabled = enable;
+	visibility_changed();
 }
 
-int Signal::get_v_offset() const
+const sr_probe* Signal::probe() const
 {
-	return _v_offset;
+	return _probe;
 }
 
-void Signal::set_v_offset(int v_offset)
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	_v_offset = v_offset;
-}
+	_name_widget = new QComboBox(parent);
+	_name_widget->setEditable(true);
 
-void Signal::paint_label(QPainter &p, int y, int right, bool hover)
-{
-	p.setBrush(_colour);
-
-	if (!_probe->enabled)
-		return;
-
-	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(highlight_pen());
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
-	}
-
-	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);
-}
+	for(unsigned int i = 0; i < countof(ProbeNames); i++)
+		_name_widget->insertItem(i, ProbeNames[i]);
+	_name_widget->setEditText(_probe->name);
 
-bool Signal::pt_in_label_rect(int y, int left, int right,
-	const QPoint &point)
-{
-	(void)left;
-
-	const QRectF label = get_label_rect(y, right);
-	return QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(right, label.bottom() + LabelHitPadding)
-			).contains(point);
+	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);
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+QMenu* Signal::create_context_menu(QWidget *parent)
 {
-	p.setPen(SignalAxisPen);
-	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+	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 = QSize(
-		p.boundingRect(QRectF(), 0, _name).width(),
-		p.boundingRect(QRectF(), 0, "Tg").height());
+	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,
-		ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 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