Trace: Renamed get_label_rect to label_rect

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 7aa199c6ec1ca89acd3cbff98c247f755ae5fe95..91ce9997ed49f3a75ad5ac4077e90bc0d39ad669 100644 (file)
--- 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 QPointF points[] = {
-               label_rect.topLeft(),
-               label_rect.topRight(),
+               r.topLeft(),
+               r.topRight(),
                QPointF(right, y),
-               label_rect.bottomRight(),
-               label_rect.bottomLeft()
+               r.bottomRight(),
+               r.bottomLeft()
        };
 
        const QPointF highlight_points[] = {
-               QPointF(label_rect.left() + 1, label_rect.top() + 1),
-               QPointF(label_rect.right(), label_rect.top() + 1),
+               QPointF(r.left() + 1, r.top() + 1),
+               QPointF(r.right(), r.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.right(), r.bottom() - 1),
+               QPointF(r.left() + 1, r.bottom() - 1)
        };
 
        if (selected()) {
@@ -158,14 +159,14 @@ 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(r, 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);
+       const QRectF label = label_rect(right);
        return enabled() && QRectF(
                QPointF(label.left() - LabelHitPadding,
                        label.top() - LabelHitPadding),
@@ -199,7 +200,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;
 
@@ -219,6 +220,10 @@ QRectF Trace::get_label_rect(int right)
                label_size.width(), label_size.height());
 }
 
+void Trace::hover_point_changed()
+{
+}
+
 QColor Trace::get_text_colour() const
 {
        return (_colour.lightness() > 64) ? Qt::black : Qt::white;
@@ -264,8 +269,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);