Removed context bar

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index cdbb65b1638e5ac145c1aaa66cf6c3d99bf12971..7c4a11e03eee9fc1082578d7ffa71a2d05563b5f 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -31,152 +31,69 @@
 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(const sr_probe *const probe) :
+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) :
+       Trace(session, probe->name),
        _probe(probe),
-       _name(probe->name),
-       _v_offset(0),
-       _selected(false)
+       _name_widget(NULL),
+       _updating_name_widget(false)
 {
        assert(_probe);
 }
 
-QString Signal::get_name() const
-{
-       return _name;
-}
-
 void Signal::set_name(QString name)
 {
-       _name = name;
+       Trace::set_name(name);
+       _updating_name_widget = true;
+       _name_widget->setEditText(name);
+       _updating_name_widget = false;
 }
 
-QColor Signal::get_colour() const
+bool Signal::enabled() const
 {
-       return _colour;
+       return _probe->enabled;
 }
 
-void Signal::set_colour(QColor colour)
+const sr_probe* Signal::probe() const
 {
-       _colour = colour;
+       return _probe;
 }
 
-int Signal::get_v_offset() const
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-       return _v_offset;
-}
+       _name_widget = new QComboBox(parent);
+       _name_widget->setEditable(true);
 
-void Signal::set_v_offset(int v_offset)
-{
-       _v_offset = v_offset;
-}
+       for(unsigned int i = 0; i < countof(ProbeNames); i++)
+               _name_widget->insertItem(i, ProbeNames[i]);
+       _name_widget->setEditText(_probe->name);
 
-bool Signal::selected() const
-{
-       return _selected;
-}
+       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
 
-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);
-       const QRectF label_rect = get_label_rect(y, right);
-
-       // Paint the label
-       const QPointF points[] = {
-               label_rect.topLeft(),
-               label_rect.topRight(),
-               QPointF(right, y),
-               label_rect.bottomRight(),
-               label_rect.bottomLeft()
-       };
-
-       const QPointF highlight_points[] = {
-               QPointF(label_rect.left() + 1, label_rect.top() + 1),
-               QPointF(label_rect.right(), label_rect.top() + 1),
-               QPointF(right - 1, y),
-               QPointF(label_rect.right(), label_rect.bottom() - 1),
-               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));
-               p.setBrush(Qt::transparent);
-               p.drawPolygon(points, countof(points));
-       }
-
-       p.setPen(Qt::transparent);
-       p.setBrush(hover ? colour.lighter() : colour);
-       p.drawPolygon(points, countof(points));
-
-       p.setPen(colour.lighter());
-       p.setBrush(Qt::transparent);
-       p.drawPolygon(highlight_points, countof(highlight_points));
-
-       p.setPen(colour.darker());
-       p.setBrush(Qt::transparent);
-       p.drawPolygon(points, countof(points));
-
-       // Paint the text
-       p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white);
-       p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
-}
-
-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,
-                       label.top() - LabelHitPadding),
-               QPointF(right, label.bottom() + LabelHitPadding)
-                       ).contains(point);
-}
-
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
-{
-       p.setPen(SignalAxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
-}
-
-void Signal::compute_text_size(QPainter &p)
-{
-       _text_size = QSize(
-               p.boundingRect(QRectF(), 0, _name).width(),
-               p.boundingRect(QRectF(), 0, "Tg").height());
+       form->addRow(tr("Name"), _name_widget);
 }
 
-QRectF Signal::get_label_rect(int y, int right)
+void Signal::on_text_changed(const QString &text)
 {
-       using pv::view::View;
-
-       const QSizeF label_size(
-               _text_size.width() + View::LabelPadding.width() * 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,
-               y + 0.5f - label_size.height() / 2,
-               label_size.width(), label_size.height());
+       Trace::set_name(text);
+       text_changed();
 }
 
 } // namespace view