projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce pv::data::SignalBase
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index f054eb2a6a2546f57eacef1025f1a0d54079bf77..fc90eba1fcd11cf6f5b5d0e132895304b8cbc9f9 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-21,30
+21,35
@@
#include <extdef.h>
#include <assert.h>
#include <extdef.h>
#include <assert.h>
-#include <
math.
h>
+#include <
cmat
h>
#include <QApplication>
#include <QFormLayout>
#include <QApplication>
#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
#include <QMenu>
#include <QMenu>
-#include <libsigrok
/libsigrok.h
>
+#include <libsigrok
cxx/libsigrokcxx.hpp
>
-#include "signal.h"
-#include "view.h"
+#include "pv/data/signalbase.hpp"
-using boost::shared_ptr;
+#include "signal.hpp"
+#include "view.hpp"
+
+using std::shared_ptr;
+using std::make_shared;
namespace pv {
namespace view {
namespace pv {
namespace view {
-const char *const
Probe
Names[] = {
+const char *const
Channel
Names[] = {
"CLK",
"DATA",
"IN",
"OUT",
"RST",
"CLK",
"DATA",
"IN",
"OUT",
"RST",
- "T
x
",
- "R
x
",
+ "T
X
",
+ "R
X
",
"EN",
"SCLK",
"MOSI",
"EN",
"SCLK",
"MOSI",
@@
-54,54
+59,76
@@
const char *const ProbeNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(
shared_ptr<pv::DevInst> dev_inst
,
- s
r_probe *const probe
) :
- Trace(
probe->name
),
-
_dev_inst(dev_inst
),
-
_probe(probe
),
-
_name_widget(NULL
),
-
_updating_name_widget(false
)
+Signal::Signal(
pv::Session &session
,
+ s
td::shared_ptr<data::SignalBase> channel
) :
+ Trace(
channel
),
+
session_(session
),
+
scale_handle_(make_shared<SignalScaleHandle>(*this)
),
+
items_({scale_handle_}
),
+
name_widget_(nullptr
)
{
{
- assert(
_probe
);
+ assert(
channel_
);
}
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
channel_->enabled()
;
}
void Signal::enable(bool enable)
{
}
void Signal::enable(bool enable)
{
- _probe->enabled = enable;
- visibility_changed();
+ channel_->set_enabled(enable);
+
+ if (owner_)
+ owner_->extents_changed(true, true);
+}
+
+shared_ptr<data::SignalBase> Signal::channel() const
+{
+ return channel_;
}
}
-const
sr_probe* Signal::probe
() const
+const
ViewItemOwner::item_list& Signal::child_items
() const
{
{
- return _probe;
+ 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)
{
}
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
{
- _name_widget = new QComboBox(parent);
- _name_widget->setEditable(true);
+ 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]);
- for(unsigned int i = 0; i < countof(ProbeNames); i++)
- _name_widget->insertItem(i, ProbeNames[i]);
- _name_widget->setEditText(_probe->name);
+ const int index = name_widget_->findText(channel_->name(), Qt::MatchExactly);
- connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
- this, SLOT(on_text_changed(const QString&)));
+ if (index == -1) {
+ name_widget_->insertItem(0, channel_->name());
+ name_widget_->setCurrentIndex(0);
+ } else {
+ name_widget_->setCurrentIndex(index);
+ }
- form->addRow(tr("Name"), _name_widget);
+ connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
+ this, SLOT(on_nameedit_changed(const QString&)));
+
+ form->addRow(tr("Name"), name_widget_);
add_colour_option(parent, form);
}
add_colour_option(parent, form);
}
@@
-125,6
+152,14
@@
void Signal::delete_pressed()
on_disable();
}
on_disable();
}
+void Signal::on_name_changed(const QString &text)
+{
+ if (text != name_widget_->currentText())
+ name_widget_->setEditText(text);
+
+ Trace::on_name_changed(text);
+}
+
void Signal::on_disable()
{
enable(false);
void Signal::on_disable()
{
enable(false);