MainWindow, View::View: Fix two memory errors reported by valgrind

[pulseview.git] / pv / data / signalbase.cpp

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 3adf3338dc4d7cd4f6f41988bf667fab90ad1af3..beefa5168a32befb421de14f36e7ef69a08a33c7 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -41,6 +41,8 @@ const int SignalBase::ColourBGAlpha = 8*256/100;
 SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel) :
        channel_(channel)
 {
+       if (channel_)
+               internal_name_ = QString::fromStdString(channel_->name());
 }
 
 shared_ptr<sigrok::Channel> SignalBase::channel() const
@@ -53,6 +55,11 @@ QString SignalBase::name() const
        return (channel_) ? QString::fromStdString(channel_->name()) : name_;
 }
 
+QString SignalBase::internal_name() const
+{
+       return internal_name_;
+}
+
 void SignalBase::set_name(QString name)
 {
        if (channel_)
@@ -145,5 +152,20 @@ void SignalBase::set_decoder_stack(std::shared_ptr<pv::data::DecoderStack>
 }
 #endif
 
+void SignalBase::save_settings(QSettings &settings) const
+{
+       settings.setValue("name", name());
+       settings.setValue("enabled", enabled());
+       settings.setValue("colour", colour());
+}
+
+void SignalBase::restore_settings(QSettings &settings)
+{
+       set_name(settings.value("name").toString());
+       set_enabled(settings.value("enabled").toBool());
+       set_colour(settings.value("colour").value<QColor>());
+}
+
+
 } // namespace data
 } // namespace pv