X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=065715aa7a996fd0c01f7aaf3763788a95f0658e;hb=379f6ccf486b331a809dde730695af26ec85991d;hp=a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index a8de4d5..065715a 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -14,13 +14,12 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
-#include
+#include
#include
#include
@@ -40,7 +39,8 @@ using std::shared_ptr;
using std::make_shared;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
@@ -60,7 +60,7 @@ const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
- std::shared_ptr channel) :
+ shared_ptr channel) :
Trace(channel),
session_(session),
scale_handle_(make_shared(*this)),
@@ -68,6 +68,9 @@ Signal::Signal(pv::Session &session,
name_widget_(nullptr)
{
assert(base_);
+
+ connect(base_.get(), SIGNAL(enabled_changed(bool)),
+ this, SLOT(on_enabled_changed(bool)));
}
void Signal::set_name(QString name)
@@ -83,17 +86,19 @@ bool Signal::enabled() const
return base_->enabled();
}
-void Signal::enable(bool enable)
+shared_ptr Signal::base() const
{
- base_->set_enabled(enable);
+ return base_;
+}
- if (owner_)
- owner_->extents_changed(true, true);
+void Signal::save_settings(QSettings &settings) const
+{
+ (void)settings;
}
-shared_ptr Signal::base() const
+void Signal::restore_settings(QSettings &settings)
{
- return base_;
+ (void)settings;
}
const ViewItemOwner::item_list& Signal::child_items() const
@@ -154,6 +159,11 @@ void Signal::delete_pressed()
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);
@@ -162,8 +172,17 @@ void Signal::on_name_changed(const QString &text)
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