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

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

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index db1af1c718e4ddb0b8262b6790b5e2fd9afea2da..54d9ee0adc2d337a87e9b3195a5223099e46e4c6 100644 (file)
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -24,6 +24,7 @@
 
 #include <QColor>
 #include <QObject>
+#include <QSettings>
 #include <QString>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -37,6 +38,11 @@ class ChannelType;
 namespace pv {
 namespace data {
 
+class Analog;
+class DecoderStack;
+class Logic;
+class SignalData;
+
 class SignalBase : public QObject
 {
        Q_OBJECT
@@ -80,6 +86,11 @@ public:
         */
        QString name() const;
 
+       /**
+        * Gets the internal name of this signal, i.e. how the device calls it.
+        */
+       QString internal_name() const;
+
        /**
         * Sets the name of the signal.
         */
@@ -100,6 +111,34 @@ public:
         */
        QColor bgcolour() const;
 
+       /**
+        * Sets the internal data object.
+        */
+       void set_data(std::shared_ptr<pv::data::SignalData> data);
+
+       /**
+        * Get the internal data as analog data object in case of analog type.
+        */
+       std::shared_ptr<pv::data::Analog> analog_data() const;
+
+       /**
+        * Get the internal data as logic data object in case of logic type.
+        */
+       std::shared_ptr<pv::data::Logic> logic_data() const;
+
+#ifdef ENABLE_DECODE
+       bool is_decode_signal() const;
+
+       std::shared_ptr<pv::data::DecoderStack> decoder_stack() const;
+
+       void set_decoder_stack(std::shared_ptr<pv::data::DecoderStack>
+               decoder_stack);
+#endif
+
+       void save_settings(QSettings &settings) const;
+
+       void restore_settings(QSettings &settings);
+
 Q_SIGNALS:
        void enabled_changed(const bool &value);
 
@@ -109,7 +148,13 @@ Q_SIGNALS:
 
 private:
        std::shared_ptr<sigrok::Channel> channel_;
-       QString name_;
+       std::shared_ptr<pv::data::SignalData> data_;
+
+#ifdef ENABLE_DECODE
+       std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+#endif
+
+       QString internal_name_, name_;
        QColor colour_, bgcolour_;
 };