ScaleSignalHandle: Initial implementation

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 2ee4b1850ded6f36e18b817df0482d0bd9bba431..47e91f4b9a67f9a904d0b059e3da5cee543a35ab 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -29,26 +29,27 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
-#include "signal.h"
-#include "view.h"
-
-#include <pv/device/devinst.h>
+#include "signal.hpp"
+#include "view.hpp"
 
 using std::shared_ptr;
+using std::make_shared;
+
+using sigrok::Channel;
 
 namespace pv {
 namespace view {
 
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
        "CLK",
        "DATA",
        "IN",
        "OUT",
        "RST",
-       "Tx",
-       "Rx",
+       "TX",
+       "RX",
        "EN",
        "SCLK",
        "MOSI",
@@ -58,70 +59,76 @@ const char *const ProbeNames[] = {
        "SCL"
 };
 
-Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
-       const sr_channel *const probe) :
-       Trace(probe->name),
-       _dev_inst(dev_inst),
-       _probe(probe),
-       _name_widget(NULL),
-       _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),
+       updating_name_widget_(false)
 {
-       assert(_probe);
+       assert(channel_);
 }
 
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
-       _updating_name_widget = true;
-       _name_widget->setEditText(name);
-       _updating_name_widget = false;
+       updating_name_widget_ = true;
+       name_widget_->setEditText(name);
+       updating_name_widget_ = false;
+
+       // 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)
 {
-       _dev_inst->enable_probe(_probe, enable);
-       visibility_changed();
+       channel_->set_enabled(enable);
+
+       if (owner_)
+               owner_->extents_changed(true, true);
 }
 
-const sr_channel* Signal::probe() const
+shared_ptr<Channel> Signal::channel() const
 {
-       return _probe;
+       return channel_;
 }
 
-void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+const ViewItemOwner::item_list& Signal::child_items() const
 {
-       int index;
+       return items_;
+}
 
-       _name_widget = new QComboBox(parent);
-       _name_widget->setEditable(true);
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       name_widget_ = new QComboBox(parent);
+       name_widget_->setEditable(true);
+       name_widget_->setCompleter(0);
 
-       for(unsigned int i = 0; i < countof(ProbeNames); i++)
-               _name_widget->insertItem(i, ProbeNames[i]);
+       for (unsigned int i = 0; i < countof(ChannelNames); i++)
+               name_widget_->insertItem(i, ChannelNames[i]);
 
-       index = _name_widget->findText(_name, Qt::MatchExactly);
+       const int index = name_widget_->findText(name_, Qt::MatchExactly);
 
        if (index == -1) {
-               _name_widget->insertItem(0, _name);
-               _name_widget->setCurrentIndex(0);
+               name_widget_->insertItem(0, name_);
+               name_widget_->setCurrentIndex(0);
        } else {
-               _name_widget->setCurrentIndex(index);
+               name_widget_->setCurrentIndex(index);
        }
 
-       _name_widget->lineEdit()->selectAll();
-       _name_widget->setFocus();
-
-       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+       connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
                this, SLOT(on_text_changed(const QString&)));
 
-       // We want to close the popup when the Enter key was pressed.
-       _name_widget->installEventFilter(this);
-
-       form->addRow(tr("Name"), _name_widget);
+       form->addRow(tr("Name"), name_widget_);
 
        add_colour_option(parent, form);
 }
@@ -140,24 +147,6 @@ QMenu* Signal::create_context_menu(QWidget *parent)
        return menu;
 }
 
-bool Signal::eventFilter(QObject *obj, QEvent *evt)
-{
-       QKeyEvent *keyEvent;
-
-       (void)obj;
-
-       if (evt->type() == QEvent::KeyPress) {
-               keyEvent = static_cast<QKeyEvent*>(evt);
-               if (keyEvent->key() == Qt::Key_Enter ||
-                   keyEvent->key() == Qt::Key_Return) {
-                       close_popup();
-                       return true;
-               }
-       }
-
-       return false;
-}
-
 void Signal::delete_pressed()
 {
        on_disable();