Added a label context bar action

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 48e47f27aa9a49304dddc6d1feef879463183cf4..bb86d8cb6d0add9c3585c8690dee22c60d06579a 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,7 @@
 
 #include <extdef.h>
 
+#include <assert.h>
 #include <math.h>
 
 #include <QApplication>
@@ -31,15 +32,45 @@ namespace pv {
 namespace view {
 
 const int Signal::LabelHitPadding = 2;
-const int Signal::LabelHighlightRadius = 6;
 
 const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
 
-Signal::Signal(QString name) :
-       _name(name),
+const char *const ProbeNames[] = {
+       "CLK",
+       "DATA",
+       "IN",
+       "OUT",
+       "RST",
+       "Tx",
+       "Rx",
+       "EN",
+       "SCLK",
+       "MOSI",
+       "MISO",
+       "/SS",
+       "SDA",
+       "SCL"
+};
+
+Signal::Signal(const sr_probe *const probe) :
+       _probe(probe),
+       _name(probe->name),
        _v_offset(0),
-       _selected(false)
+       _name_action(NULL),
+       _name_widget(),
+       _updating_name_widget(false)
 {
+       assert(_probe);
+
+       _name_action.setDefaultWidget(&_name_widget);
+
+       _name_widget.setEditable(true);
+       for(unsigned int i = 0; i < countof(ProbeNames); i++)
+               _name_widget.insertItem(i, ProbeNames[i]);
+       _name_widget.setEditText(probe->name);
+
+       connect(&_name_widget, SIGNAL(editTextChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
 }
 
 QString Signal::get_name() const
@@ -50,6 +81,9 @@ QString Signal::get_name() const
 void Signal::set_name(QString name)
 {
        _name = name;
+       _updating_name_widget = true;
+       _name_widget.setEditText(name);
+       _updating_name_widget = false;
 }
 
 QColor Signal::get_colour() const
@@ -72,20 +106,13 @@ void Signal::set_v_offset(int v_offset)
        _v_offset = v_offset;
 }
 
-bool Signal::selected() const
-{
-       return _selected;
-}
-
-void Signal::select(bool select)
-{
-       _selected = select;
-}
-
 void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 {
        p.setBrush(_colour);
 
+       if (!_probe->enabled)
+               return;
+
        const QColor colour = get_colour();
 
        compute_text_size(p);
@@ -108,10 +135,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
                QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
        };
 
-       if (_selected) {
-               p.setPen(QPen(QApplication::palette().brush(
-                       QPalette::Highlight), LabelHighlightRadius,
-                       Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+       if (selected()) {
+               p.setPen(highlight_pen());
                p.setBrush(Qt::transparent);
                p.drawPolygon(points, countof(points));
        }
@@ -173,5 +198,11 @@ QRectF Signal::get_label_rect(int y, int right)
                label_size.width(), label_size.height());
 }
 
+void Signal::on_text_changed(const QString &text)
+{
+       _name = text;
+       text_changed();
+}
+
 } // namespace view
 } // namespace pv