projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't use get_active_view() to determine active session
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index fc90eba1fcd11cf6f5b5d0e132895304b8cbc9f9..59817eba2c334fcad882d296f5f0a4ac158e7d17 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-40,7
+40,8
@@
using std::shared_ptr;
using std::make_shared;
namespace pv {
using std::make_shared;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
const char *const ChannelNames[] = {
"CLK",
@@
-67,7
+68,10
@@
Signal::Signal(pv::Session &session,
items_({scale_handle_}),
name_widget_(nullptr)
{
items_({scale_handle_}),
name_widget_(nullptr)
{
- assert(channel_);
+ assert(base_);
+
+ connect(base_.get(), SIGNAL(enabled_changed(bool)),
+ this, SLOT(on_enabled_changed(bool)));
}
void Signal::set_name(QString name)
}
void Signal::set_name(QString name)
@@
-80,20
+84,22
@@
void Signal::set_name(QString name)
bool Signal::enabled() const
{
bool Signal::enabled() const
{
- return
channel
_->enabled();
+ return
base
_->enabled();
}
}
-void Signal::enable(bool enable)
+shared_ptr<data::SignalBase> Signal::base() const
{
{
- channel_->set_enabled(enable);
+ return base_;
+}
- if (owner_)
- owner_->extents_changed(true, true);
+void Signal::save_settings(QSettings &settings) const
+{
+ (void)settings;
}
}
-shared_ptr<data::SignalBase> Signal::channel() const
+void Signal::restore_settings(QSettings &settings)
{
{
-
return channel_
;
+
(void)settings
;
}
const ViewItemOwner::item_list& Signal::child_items() const
}
const ViewItemOwner::item_list& Signal::child_items() const
@@
-103,7
+109,7
@@
const ViewItemOwner::item_list& Signal::child_items() const
void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- if (
channel
_->enabled())
+ if (
base
_->enabled())
Trace::paint_back(p, pp);
}
Trace::paint_back(p, pp);
}
@@
-116,10
+122,10
@@
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
for (unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
for (unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
- const int index = name_widget_->findText(
channel
_->name(), Qt::MatchExactly);
+ const int index = name_widget_->findText(
base
_->name(), Qt::MatchExactly);
if (index == -1) {
if (index == -1) {
- name_widget_->insertItem(0,
channel
_->name());
+ name_widget_->insertItem(0,
base
_->name());
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
@@
-154,6
+160,11
@@
void Signal::delete_pressed()
void Signal::on_name_changed(const QString &text)
{
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 (text != name_widget_->currentText())
name_widget_->setEditText(text);
if (text != name_widget_->currentText())
name_widget_->setEditText(text);
@@
-162,8
+173,17
@@
void Signal::on_name_changed(const QString &text)
void Signal::on_disable()
{
void Signal::on_disable()
{
- enable(false);
+ base_->set_enabled(false);
+}
+
+void Signal::on_enabled_changed(bool enabled)
+{
+ (void)enabled;
+
+ if (owner_)
+ owner_->extents_changed(true, true);
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv