X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=ab1426e0ed08d548e11157cfb074971c422e00f2;hb=d29059343817896931df3cfce2b34ec5fcc7818b;hp=3e951b339bc261c319e3807249c2a4d91ae35462;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 3e951b3..ab1426e 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,11 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
+#include <QApplication>
+
 #include "signal.h"
 #include "view.h"
 
@@ -28,9 +33,45 @@ namespace view {
 
 const int Signal::LabelHitPadding = 2;
 
-Signal::Signal(QString name) :
-	_name(name)
+const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
+
+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) :
+	_session(session),
+	_probe(probe),
+	_name(probe->name),
+	_v_offset(0),
+	_name_action(NULL),
+	_name_widget(),
+	_updating_name_widget(false)
 {
+	assert(_probe);
+
+	_name_action.setDefaultWidget(&_name_widget);
+
+	_name_widget.setEditable(true);
+	for(unsigned int i = 0; i < countof(ProbeNames); i++)
+		_name_widget.insertItem(i, ProbeNames[i]);
+	_name_widget.setEditText(probe->name);
+
+	connect(&_name_widget, SIGNAL(editTextChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
 }
 
 QString Signal::get_name() const
@@ -41,6 +82,9 @@ QString Signal::get_name() const
 void Signal::set_name(QString name)
 {
 	_name = name;
+	_updating_name_widget = true;
+	_name_widget.setEditText(name);
+	_updating_name_widget = false;
 }
 
 QColor Signal::get_colour() const
@@ -53,21 +97,33 @@ void Signal::set_colour(QColor colour)
 	_colour = colour;
 }
 
-void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
+int Signal::get_v_offset() const
+{
+	return _v_offset;
+}
+
+void Signal::set_v_offset(int v_offset)
+{
+	_v_offset = v_offset;
+}
+
+void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 {
 	p.setBrush(_colour);
 
+	if (!_probe->enabled)
+		return;
+
 	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);
+	const QRectF label_rect = get_label_rect(y, right);
 
 	// Paint the label
 	const QPointF points[] = {
 		label_rect.topLeft(),
 		label_rect.topRight(),
-		QPointF(rect.right(), nominal_offset),
+		QPointF(right, y),
 		label_rect.bottomRight(),
 		label_rect.bottomLeft()
 	};
@@ -75,11 +131,17 @@ void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 	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(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));
@@ -97,37 +159,51 @@ void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
-bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
+bool Signal::pt_in_label_rect(int y, int left, int right,
+	const QPoint &point)
 {
-	const QRectF label = get_label_rect(rect);
+	(void)left;
+
+	const QRectF label = get_label_rect(y, right);
 	return QRectF(
 		QPointF(label.left() - LabelHitPadding,
 			label.top() - LabelHitPadding),
-		QPointF(rect.right(),
-			label.bottom() + LabelHitPadding)
-		).contains(point);
+		QPointF(right, label.bottom() + LabelHitPadding)
+			).contains(point);
+}
+
+void Signal::paint_axis(QPainter &p, int y, int left, int right)
+{
+	p.setPen(SignalAxisPen);
+	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
 }
 
 void Signal::compute_text_size(QPainter &p)
 {
-	_text_size = p.boundingRect(QRectF(), 0, _name).size();
+	_text_size = QSize(
+		p.boundingRect(QRectF(), 0, _name).width(),
+		p.boundingRect(QRectF(), 0, "Tg").height());
 }
 
-QRectF Signal::get_label_rect(const QRect &rect)
+QRectF Signal::get_label_rect(int y, int right)
 {
 	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);
+		ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 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,
+		right - label_arrow_length - label_size.width() - 0.5,
+		y + 0.5f - label_size.height() / 2,
 		label_size.width(), label_size.height());
 }
 
+void Signal::on_text_changed(const QString &text)
+{
+	_name = text;
+	text_changed();
+}
+
 } // namespace view
 } // namespace pv