X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=ca5f7150353ac67f03f94aae996d37e49d4a35eb;hb=b5cb6c35e5475e143554ec6daea86310de5e32a5;hp=250376ebb8828d931300a8a1a9ba5fc96ca4b749;hpb=0891e69b714a1eaf8b0d5c2e85f092e9f0b44088;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 250376eb..ca5f7150 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -42,6 +42,7 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
+	_view(NULL),
 	_name(name),
 	_v_offset(0),
 	_popup(NULL),
@@ -118,23 +119,23 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
 	const QColor colour = get_colour();
 
-	const QRectF label_rect = get_label_rect(right);
+	const QRectF r = label_rect(right);
 
 	// Paint the label
+	const float label_arrow_length = r.height() / 2;
 	const QPointF points[] = {
-		label_rect.topLeft(),
-		label_rect.topRight(),
-		QPointF(right, y),
-		label_rect.bottomRight(),
-		label_rect.bottomLeft()
+		r.topLeft(),
+		QPointF(r.right() - label_arrow_length, r.top()),
+		QPointF(r.right(), y),
+		QPointF(r.right() - label_arrow_length, r.bottom()),
+		r.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)
+		QPointF(r.left() + 1, r.top() + 1),
+		QPointF(r.right() - label_arrow_length, r.top() + 1),
+		QPointF(r.right() - 1, y),
+		QPointF(r.right() - label_arrow_length, r.bottom() - 1),
+		QPointF(r.left() + 1, r.bottom() - 1)
 	};
 
 	if (selected()) {
@@ -158,19 +159,15 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	// Paint the text
 	p.setPen(get_text_colour());
 	p.setFont(QApplication::font());
-	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
+	p.drawText(QRectF(r.x(), r.y(),
+		r.width() - label_arrow_length, r.height()),
+		Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
 bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
 {
 	(void)left;
-
-	const QRectF label = get_label_rect(right);
-	return enabled() && QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(right, label.bottom() + LabelHitPadding)
-			).contains(point);
+	return enabled() && label_rect(right).contains(point);
 }
 
 QMenu* Trace::create_context_menu(QWidget *parent)
@@ -199,7 +196,7 @@ int Trace::get_y() const
 	return _v_offset - _view->v_offset();
 }
 
-QRectF Trace::get_label_rect(int right)
+QRectF Trace::label_rect(int right)
 {
 	using pv::view::View;
 
@@ -212,29 +209,16 @@ QRectF Trace::get_label_rect(int right)
 	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;
+	const float half_height = label_size.height() / 2;
 	return QRectF(
-		right - label_arrow_length - label_size.width() - 0.5,
-		get_y() + 0.5f - label_size.height() / 2,
-		label_size.width(), label_size.height());
+		right - half_height - label_size.width() - 0.5,
+		get_y() + 0.5f - half_height,
+		label_size.width() + half_height,
+		label_size.height());
 }
 
-bool Trace::eventFilter(QObject *obj, QEvent *evt)
+void Trace::hover_point_changed()
 {
-	QKeyEvent *keyEvent;
-
-	(void)obj;
-
-	if (evt->type() == QEvent::KeyPress) {
-		keyEvent = static_cast<QKeyEvent*>(evt);
-		if (keyEvent->key() == Qt::Key_Enter ||
-		    keyEvent->key() == Qt::Key_Return) {
-			close_popup();
-			return true;
-		}
-	}
-
-	return false;
 }
 
 QColor Trace::get_text_colour() const
@@ -282,23 +266,13 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	QLineEdit *const name_edit = new QLineEdit(parent);
 	name_edit->setText(_name);
-	name_edit->selectAll();
-	name_edit->setFocus();
 	connect(name_edit, SIGNAL(textChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
 	form->addRow(tr("Name"), name_edit);
 
-	// We want to close the popup when the Enter key was pressed.
-	name_edit->installEventFilter(this);
-
 	add_colour_option(parent, form);
 }
 
-void Trace::close_popup()
-{
-	_popup->close();
-}
-
 void Trace::on_popup_closed()
 {
 	_popup = NULL;