X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=896fdec5a5ee50bb40409ad9bed7154b3c955e0d;hb=adb0a9838d35c42add30f64df4f8df427aed6b89;hp=ae8ee901a27316738434c6f8e64a29376a77496f;hpb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ae8ee90..896fdec 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -32,6 +32,7 @@
 #include "view.h"
 
 #include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
 
 namespace pv {
 namespace view {
@@ -39,8 +40,7 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
-Trace::Trace(pv::SigSession &session, QString name) :
-	_session(session),
+Trace::Trace(QString name) :
 	_name(name),
 	_v_offset(0),
 	_popup(NULL),
@@ -165,7 +165,7 @@ bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
 	(void)left;
 
 	const QRectF label = get_label_rect(right);
-	return QRectF(
+	return enabled() && QRectF(
 		QPointF(label.left() - LabelHitPadding,
 			label.top() - LabelHitPadding),
 		QPointF(right, label.bottom() + LabelHitPadding)
@@ -263,6 +263,8 @@ 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);
@@ -270,6 +272,11 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	add_colour_option(parent, form);
 }
 
+void Trace::close_popup()
+{
+	_popup->close();
+}
+
 void Trace::on_popup_closed()
 {
 	_popup = NULL;