Added _session reference to Signal objects

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ed414c7c510c13b60c0f6225bd93d69a443b16c2..ab1426e0ed08d548e11157cfb074971c422e00f2 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,9 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
 #include <QApplication>
 
 #include "signal.h"
@@ -29,15 +32,46 @@ 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(pv::SigSession &session, const sr_probe *const probe) :
+       _session(session),
+       _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
@@ -48,6 +82,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
@@ -70,20 +107,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);
@@ -106,10 +136,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));
        }
@@ -134,6 +162,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 bool Signal::pt_in_label_rect(int y, int left, int right,
        const QPoint &point)
 {
+       (void)left;
+
        const QRectF label = get_label_rect(y, right);
        return QRectF(
                QPointF(label.left() - LabelHitPadding,
@@ -150,7 +180,9 @@ void Signal::paint_axis(QPainter &p, int y, int left, int right)
 
 void Signal::compute_text_size(QPainter &p)
 {
-       _text_size = p.boundingRect(QRectF(), 0, _name).size();
+       _text_size = QSize(
+               p.boundingRect(QRectF(), 0, _name).width(),
+               p.boundingRect(QRectF(), 0, "Tg").height());
 }
 
 QRectF Signal::get_label_rect(int y, int right)
@@ -159,7 +191,7 @@ QRectF Signal::get_label_rect(int y, int right)
 
        const QSizeF label_size(
                _text_size.width() + View::LabelPadding.width() * 2,
-               _text_size.height() + View::LabelPadding.height() * 2);
+               ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
        const float label_arrow_length = label_size.height() / 2;
        return QRectF(
                right - label_arrow_length - label_size.width() - 0.5,
@@ -167,5 +199,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