projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix signal connection for view::Signal and SignalBase enabled state
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae..ffe4f67dc9c4cf14cff9e8573b6cce69d6fe669a 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-68,6
+68,9
@@
Signal::Signal(pv::Session &session,
name_widget_(nullptr)
{
assert(base_);
name_widget_(nullptr)
{
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)
@@
-83,14
+86,6
@@
bool Signal::enabled() const
return base_->enabled();
}
return base_->enabled();
}
-void Signal::enable(bool enable)
-{
- base_->set_enabled(enable);
-
- if (owner_)
- owner_->extents_changed(true, true);
-}
-
shared_ptr<data::SignalBase> Signal::base() const
{
return base_;
shared_ptr<data::SignalBase> Signal::base() const
{
return base_;
@@
-162,7
+157,15
@@
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 view