X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=7c4a11e03eee9fc1082578d7ffa71a2d05563b5f;hp=02732ffc7a19112d3e6fc236b7beea57ccf6ed8c;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hpb=2e57535108a0ae2e5d1ee454f1e61b71d23afdb3

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 02732ffc..7c4a11e0 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,124 +20,80 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
+#include <QApplication>
+
 #include "signal.h"
 #include "view.h"
 
 namespace pv {
 namespace view {
 
-const int Signal::LabelHitPadding = 2;
-
-Signal::Signal(QString name) :
-	_name(name),
-	_v_offset(0)
-{
-}
-
-QString Signal::get_name() const
+const char *const ProbeNames[] = {
+	"CLK",
+	"DATA",
+	"IN",
+	"OUT",
+	"RST",
+	"Tx",
+	"Rx",
+	"EN",
+	"SCLK",
+	"MOSI",
+	"MISO",
+	"/SS",
+	"SDA",
+	"SCL"
+};
+
+Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
+	Trace(session, probe->name),
+	_probe(probe),
+	_name_widget(NULL),
+	_updating_name_widget(false)
 {
-	return _name;
+	assert(_probe);
 }
 
 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)
+const sr_probe* Signal::probe() const
 {
-	_colour = colour;
+	return _probe;
 }
 
-int Signal::get_v_offset() const
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	return _v_offset;
-}
+	_name_widget = new QComboBox(parent);
+	_name_widget->setEditable(true);
 
-void Signal::set_v_offset(int v_offset)
-{
-	_v_offset = v_offset;
-}
+	for(unsigned int i = 0; i < countof(ProbeNames); i++)
+		_name_widget->insertItem(i, ProbeNames[i]);
+	_name_widget->setEditText(_probe->name);
 
-void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
-{
-	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);
-}
+	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
 
-bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
-{
-	const QRectF label = get_label_rect(rect);
-	return QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(rect.right(),
-			label.bottom() + LabelHitPadding)
-		).contains(point);
-}
-
-void Signal::compute_text_size(QPainter &p)
-{
-	_text_size = p.boundingRect(QRectF(), 0, _name).size();
+	form->addRow(tr("Name"), _name_widget);
 }
 
-QRectF Signal::get_label_rect(const QRect &rect)
+void Signal::on_text_changed(const QString &text)
 {
-	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());
+	Trace::set_name(text);
+	text_changed();
 }
 
 } // namespace view