Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 2ee4b1850ded6f36e18b817df0482d0bd9bba431..59817eba2c334fcad882d296f5f0a4ac158e7d17 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
 #include <extdef.h>
 
 #include <assert.h>

-#include <math.h>
+#include <cmath>

 
 #include <QApplication>
 #include <QFormLayout>
 
 #include <QApplication>
 #include <QFormLayout>


@@ -29,26 +29,28 @@
 #include <QLineEdit>
 #include <QMenu>
 
 #include <QLineEdit>
 #include <QMenu>
 

-#include <libsigrok/libsigrok.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>

 
 

-#include "signal.h"
-#include "view.h"
+#include "pv/data/signalbase.hpp"

 
 

-#include <pv/device/devinst.h>
+#include "signal.hpp"
+#include "view.hpp"

 
 using std::shared_ptr;
 
 using std::shared_ptr;

+using std::make_shared;

 
 namespace pv {
 
 namespace pv {

-namespace view {
+namespace views {
+namespace TraceView {

 
 

-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {

        "CLK",
        "DATA",
        "IN",
        "OUT",
        "RST",
        "CLK",
        "DATA",
        "IN",
        "OUT",
        "RST",

-       "Tx",
-       "Rx",
+       "TX",
+       "RX",

        "EN",
        "SCLK",
        "MOSI",
        "EN",
        "SCLK",
        "MOSI",


@@ -58,70 +60,81 @@ const char *const ProbeNames[] = {
        "SCL"
 };
 
        "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<data::SignalBase> channel) :
+       Trace(channel),
+       session_(session),
+       scale_handle_(make_shared<SignalScaleHandle>(*this)),
+       items_({scale_handle_}),
+       name_widget_(nullptr)

 {
 {

-       assert(_probe);
+       assert(base_);
+
+       connect(base_.get(), SIGNAL(enabled_changed(bool)),
+               this, SLOT(on_enabled_changed(bool)));

 }
 
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
 }
 
 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);

 }
 
 bool Signal::enabled() const
 {
 }
 
 bool Signal::enabled() const
 {

-       return _probe->enabled;
+       return base_->enabled();

 }
 
 }
 

-void Signal::enable(bool enable)
+shared_ptr<data::SignalBase> Signal::base() const

 {
 {

-       _dev_inst->enable_probe(_probe, enable);
-       visibility_changed();
+       return base_;

 }
 
 }
 

-const sr_channel* Signal::probe() const
+void Signal::save_settings(QSettings &settings) const

 {
 {

-       return _probe;
+       (void)settings;

 }
 
 }
 

-void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+void Signal::restore_settings(QSettings &settings)
+{
+       (void)settings;
+}
+
+const ViewItemOwner::item_list& Signal::child_items() const

 {
 {

-       int index;
+       return items_;
+}
+
+void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (base_->enabled())
+               Trace::paint_back(p, pp);
+}

 
 

-       _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(nullptr);

 
 

-       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(base_->name(), Qt::MatchExactly);

 
        if (index == -1) {
 
        if (index == -1) {

-               _name_widget->insertItem(0, _name);
-               _name_widget->setCurrentIndex(0);
+               name_widget_->insertItem(0, base_->name());
+               name_widget_->setCurrentIndex(0);

        } else {
        } else {

-               _name_widget->setCurrentIndex(index);
+               name_widget_->setCurrentIndex(index);

        }
 
        }
 

-       _name_widget->lineEdit()->selectAll();
-       _name_widget->setFocus();
+       connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
+               this, SLOT(on_nameedit_changed(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);
 }
 
        add_colour_option(parent, form);
 }


@@ -140,33 +153,37 @@ QMenu* Signal::create_context_menu(QWidget *parent)
        return menu;
 }
 
        return menu;
 }
 

-bool Signal::eventFilter(QObject *obj, QEvent *evt)
+void Signal::delete_pressed()

 {
 {

-       QKeyEvent *keyEvent;
+       on_disable();
+}

 
 

-       (void)obj;
+void Signal::on_name_changed(const QString &text)
+{
+       // On startup, this event is fired when a session restores signal
+       // names. However, the name widget hasn't yet been created.
+       if (!name_widget_)
+               return;

 
 

-       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;
-               }
-       }
+       if (text != name_widget_->currentText())
+               name_widget_->setEditText(text);

 
 

-       return false;
+       Trace::on_name_changed(text);

 }
 
 }
 

-void Signal::delete_pressed()
+void Signal::on_disable()

 {
 {

-       on_disable();
+       base_->set_enabled(false);

 }
 
 }
 

-void Signal::on_disable()
+void Signal::on_enabled_changed(bool enabled)

 {
 {

-       enable(false);
+       (void)enabled;
+
+       if (owner_)
+               owner_->extents_changed(true, true);

 }
 
 }
 

-} // namespace view
+} // namespace TraceView
+} // namespace views

 } // namespace pv
 } // namespace pv