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 ecf74f08c0fc8528c94b099de5e280902891f2b6..fc90eba1fcd11cf6f5b5d0e132895304b8cbc9f9 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 <
cmat
h>
#include <QApplication>
#include <QFormLayout>
#include <QApplication>
#include <QFormLayout>
@@
-29,14
+29,15
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+#include "pv/data/signalbase.hpp"
#include "signal.hpp"
#include "view.hpp"
using std::shared_ptr;
#include "signal.hpp"
#include "view.hpp"
using std::shared_ptr;
-
-using sigrok::Channel;
+using std::make_shared;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-47,8
+48,8
@@
const char *const ChannelNames[] = {
"IN",
"OUT",
"RST",
"IN",
"OUT",
"RST",
- "T
x
",
- "R
x
",
+ "T
X
",
+ "R
X
",
"EN",
"SCLK",
"MOSI",
"EN",
"SCLK",
"MOSI",
@@
-59,12
+60,12
@@
const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
};
Signal::Signal(pv::Session &session,
- std::shared_ptr<
sigrok::Channel
> channel) :
- Trace(channel
->name().c_str()
),
+ std::shared_ptr<
data::SignalBase
> channel) :
+ Trace(channel),
session_(session),
session_(session),
-
channel_(channel
),
-
name_widget_(NULL
),
-
updating_name_widget_(false
)
+
scale_handle_(make_shared<SignalScaleHandle>(*this)
),
+
items_({scale_handle_}
),
+
name_widget_(nullptr
)
{
assert(channel_);
}
{
assert(channel_);
}
@@
-72,13
+73,9
@@
Signal::Signal(pv::Session &session,
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;
- // Store the channel name in sigrok::Channel so that it
- // will end up in the .sr file upon save.
- channel_->set_name(name.toStdString());
+ if (name != name_widget_->currentText())
+ name_widget_->setEditText(name);
}
bool Signal::enabled() const
}
bool Signal::enabled() const
@@
-94,32
+91,42
@@
void Signal::enable(bool enable)
owner_->extents_changed(true, true);
}
owner_->extents_changed(true, true);
}
-shared_ptr<
Channel
> Signal::channel() const
+shared_ptr<
data::SignalBase
> Signal::channel() const
{
return channel_;
}
{
return channel_;
}
-void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+const ViewItemOwner::item_list& Signal::child_items() const
{
{
- int index;
+ 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_ = new QComboBox(parent);
name_widget_->setEditable(true);
+ name_widget_->setCompleter(nullptr);
- for(unsigned int i = 0; i < countof(ChannelNames); i++)
+ for
(unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
name_widget_->insertItem(i, ChannelNames[i]);
-
index = name_widget_->findText(name_
, Qt::MatchExactly);
+
const int index = name_widget_->findText(channel_->name()
, Qt::MatchExactly);
if (index == -1) {
if (index == -1) {
- name_widget_->insertItem(0,
name_
);
+ name_widget_->insertItem(0,
channel_->name()
);
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
}
connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
}
connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
- this, SLOT(on_
tex
t_changed(const QString&)));
+ this, SLOT(on_
nameedi
t_changed(const QString&)));
form->addRow(tr("Name"), name_widget_);
form->addRow(tr("Name"), name_widget_);
@@
-145,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);