]> sigrok.org Git - pulseview.git/blobdiff - pv/views/trace/decodetrace.hpp
DecodeTrace: Fix on_setting_changed() handling
[pulseview.git] / pv / views / trace / decodetrace.hpp
index a65f707872bda76265faf56d73a306bdc9bb6193..3a61c31d8833448ea638114e20c1a5a79bd05516 100644 (file)
@@ -34,6 +34,7 @@
 #include <QTimer>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
@@ -86,6 +87,8 @@ public:
        DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
                int index);
 
+       ~DecodeTrace();
+
        bool enabled() const;
 
        shared_ptr<data::SignalBase> base() const;
@@ -176,9 +179,9 @@ private:
                QWidget *parent, QFormLayout *form);
 
        QComboBox* create_channel_selector(QWidget *parent,
-               const data::DecodeChannel *ch);
+               const data::decode::DecodeChannel *ch);
        QComboBox* create_channel_selector_init_state(QWidget *parent,
-               const data::DecodeChannel *ch);
+               const data::decode::DecodeChannel *ch);
 
        void export_annotations(vector<data::decode::Annotation> *annotations) const;
 
@@ -186,6 +189,8 @@ public:
        virtual void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
+       void on_setting_changed(const QString &key, const QVariant &value);
+
        void on_new_annotations();
        void on_delayed_trace_update();
        void on_decode_reset();
@@ -220,6 +225,7 @@ private:
        shared_ptr<data::DecodeSignal> decode_signal_;
 
        vector<data::decode::Row> visible_rows_;
+       bool always_show_all_rows_;
 
        map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
        map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID