Refactored Trace::get_label_rect to use get_y

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index b3ebd95b4a7e1928b1c33370f39a1cf8506a3f86..e9424750c997237ff1f5623387d286f6145f97dd 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,6 +23,9 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QColorDialog>
+#include <QInputDialog>
+
 #include "trace.h"
 #include "view.h"
 
@@ -163,6 +166,23 @@ bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
                        ).contains(point);
 }
 
+QMenu* Trace::create_context_menu(QWidget *parent)
+{
+       QMenu *const menu = SelectableItem::create_context_menu(parent);
+
+       QAction *const set_name = new QAction(tr("Set &Name..."), this);
+       connect(set_name, SIGNAL(triggered()),
+               this, SLOT(on_action_set_name_triggered()));
+       menu->addAction(set_name);
+
+       QAction *const set_colour = new QAction(tr("Set &Colour..."), this);
+       connect(set_colour, SIGNAL(triggered()),
+               this, SLOT(on_action_set_colour_triggered()));
+       menu->addAction(set_colour);
+
+       return menu;
+}
+
 int Trace::get_y() const
 {
        return _v_offset - _view->v_offset();
@@ -191,7 +211,6 @@ QRectF Trace::get_label_rect(int right)
        using pv::view::View;
 
        assert(_view);
-       const int y = _v_offset - _view->v_offset();
 
        const QSizeF label_size(
                _text_size.width() + View::LabelPadding.width() * 2,
@@ -199,9 +218,31 @@ QRectF Trace::get_label_rect(int right)
        const float label_arrow_length = label_size.height() / 2;
        return QRectF(
                right - label_arrow_length - label_size.width() - 0.5,
-               y + 0.5f - label_size.height() / 2,
+               get_y() + 0.5f - label_size.height() / 2,
                label_size.width(), label_size.height());
 }
 
+void Trace::on_action_set_name_triggered()
+{
+       bool ok = false;
+
+       const QString new_label = QInputDialog::getText(_context_parent,
+               tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(),
+               &ok);
+
+       if (ok)
+               set_name(new_label);
+}
+
+void Trace::on_action_set_colour_triggered()
+{
+       const QColor new_colour = QColorDialog::getColor(
+               get_colour(), _context_parent, tr("Set Colour"));
+
+       if (new_colour.isValid())
+               set_colour(new_colour);
+}
+
+
 } // namespace view
 } // namespace pv