X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=61a002bb80f422a042f300c9d01526b04d810730;hb=c294543f8df3b3c90fa613c8198506aea68e91e7;hp=7aa199c6ec1ca89acd3cbff98c247f755ae5fe95;hpb=0715fb8c638b53ac25590841fcbf3a1da3546b68;p=pulseview.git diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 7aa199c6..61a002bb 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), @@ -82,7 +83,15 @@ void Trace::set_v_offset(int v_offset) void Trace::set_view(pv::view::View *view) { assert(view); + + if (_view) + disconnect(_view, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); + _view = view; + + connect(view, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); } void Trace::paint_back(QPainter &p, int left, int right) @@ -264,8 +273,6 @@ 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); @@ -273,6 +280,10 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) add_colour_option(parent, form); } +void Trace::hover_point_changed() +{ +} + void Trace::on_popup_closed() { _popup = NULL; @@ -291,5 +302,10 @@ void Trace::on_colour_changed(const QColor &colour) colour_changed(); } +void Trace::on_hover_point_changed() +{ + hover_point_changed(); +} + } // namespace view } // namespace pv