View: Restore the original signals_changed() positioning code

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 9b08336e3c64cc627f2e919a8a8b000383253017..5cd5b183590af45dcd783dd948f3a0d81af84582 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -21,26 +21,35 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
 
-#include "signal.h"
-#include "view.h"
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+#include "signal.hpp"
+#include "view.hpp"
+
+using std::shared_ptr;
+using std::make_shared;
+
+using sigrok::Channel;
 
 namespace pv {
 namespace view {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
        "CLK",
        "DATA",
        "IN",
        "OUT",
        "RST",
-       "Tx",
-       "Rx",
+       "TX",
+       "RX",
        "EN",
        "SCLK",
        "MOSI",
@@ -50,49 +59,107 @@ const char *const ProbeNames[] = {
        "SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
-       Trace(session, probe->name),
-       _probe(probe),
-       _name_action(NULL),
-       _name_widget(),
-       _updating_name_widget(false)
+Signal::Signal(pv::Session &session,
+       std::shared_ptr<sigrok::Channel> channel) :
+       Trace(QString::fromUtf8(channel->name().c_str())),
+       session_(session),
+       channel_(channel),
+       scale_handle_(make_shared<SignalScaleHandle>(*this)),
+       items_({scale_handle_}),
+       name_widget_(nullptr)
 {
-       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&)));
+       assert(channel_);
 }
 
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
-       _updating_name_widget = true;
-       _name_widget.setEditText(name);
-       _updating_name_widget = false;
+
+       if (name != name_widget_->currentText())
+               name_widget_->setEditText(name);
+
+       // Store the channel name in sigrok::Channel so that it
+       // will end up in the .sr file upon save.
+       channel_->set_name(name.toUtf8().constData());
 }
 
 bool Signal::enabled() const
 {
-       return _probe->enabled;
+       return channel_->enabled();
+}
+
+void Signal::enable(bool enable)
+{
+       channel_->set_enabled(enable);
+
+       if (owner_)
+               owner_->extents_changed(true, true);
+}
+
+shared_ptr<Channel> Signal::channel() const
+{
+       return channel_;
+}
+
+const ViewItemOwner::item_list& Signal::child_items() const
+{
+       return items_;
+}
+
+void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (channel_->enabled())
+               Trace::paint_back(p, pp);
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       name_widget_ = new QComboBox(parent);
+       name_widget_->setEditable(true);
+       name_widget_->setCompleter(nullptr);
+
+       for (unsigned int i = 0; i < countof(ChannelNames); i++)
+               name_widget_->insertItem(i, ChannelNames[i]);
+
+       const int index = name_widget_->findText(name_, Qt::MatchExactly);
+
+       if (index == -1) {
+               name_widget_->insertItem(0, name_);
+               name_widget_->setCurrentIndex(0);
+       } else {
+               name_widget_->setCurrentIndex(index);
+       }
+
+       connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
+
+       form->addRow(tr("Name"), name_widget_);
+
+       add_colour_option(parent, form);
+}
+
+QMenu* Signal::create_context_menu(QWidget *parent)
+{
+       QMenu *const menu = Trace::create_context_menu(parent);
+
+       menu->addSeparator();
+
+       QAction *const disable = new QAction(tr("Disable"), this);
+       disable->setShortcuts(QKeySequence::Delete);
+       connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
+       menu->addAction(disable);
+
+       return menu;
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+void Signal::delete_pressed()
 {
-       p.setPen(SignalAxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+       on_disable();
 }
 
-void Signal::on_text_changed(const QString &text)
+void Signal::on_disable()
 {
-       Trace::set_name(text);
-       text_changed();
+       enable(false);
 }
 
 } // namespace view