DecodeTrace: Reset cached trace properties when decoder stack resets

[pulseview.git] / pv / views / trace / decodetrace.hpp

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e53e2b802b7585e0b31360c169dd34f2b9b21302..43473873444f01ba3f786b3c1fcd63b084215f70 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,7 +27,9 @@
 #include <memory>
 #include <vector>
 
+#include <QComboBox>
 #include <QSignalMapper>
+#include <QTimer>
 
 #include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
@@ -49,8 +51,8 @@ namespace pv {
 class Session;
 
 namespace data {
-class DecoderStack;
 class SignalBase;
+struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
@@ -58,7 +60,7 @@ class Annotation;
 class Decoder;
 class Row;
 }
-}
+}  // namespace data
 
 namespace widgets {
 class DecoderGroupBox;
@@ -71,15 +73,6 @@ class DecodeTrace : public Trace
 {
        Q_OBJECT
 
-private:
-       struct ChannelSelector
-       {
-               const QComboBox *combo_;
-               const QComboBox *combo_initial_pin_;
-               const shared_ptr<pv::data::decode::Decoder> decoder_;
-               const srd_channel *pdch_;
-       };
-
 private:
        static const QColor DecodeColours[4];
        static const QColor ErrorBgColour;
@@ -90,6 +83,8 @@ private:
        static const int RowTitleMargin;
        static const int DrawPadding;
 
+       static const int MaxTraceUpdateRate;
+
        static const QColor Colours[16];
        static const QColor OutlineColours[16];
 
@@ -99,8 +94,6 @@ public:
 
        bool enabled() const;
 
-       const shared_ptr<pv::data::DecoderStack>& decoder() const;
-
        shared_ptr<data::SignalBase> base() const;
 
        /**
@@ -181,28 +174,26 @@ private:
                QWidget *parent, QFormLayout *form);
 
        QComboBox* create_channel_selector(QWidget *parent,
-               const shared_ptr<pv::data::decode::Decoder> &dec,
-               const srd_channel *const pdch);
-
-       QComboBox* create_channel_selector_initial_pin(QWidget *parent,
-               const shared_ptr<pv::data::decode::Decoder> &dec,
-               const srd_channel *const pdch);
-
-       void commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec);
-
-       void commit_channels();
+               const data::DecodeChannel *ch);
+       QComboBox* create_channel_selector_init_state(QWidget *parent,
+               const data::DecodeChannel *ch);
 
 public:
-       void hover_point_changed();
+       void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
        void on_new_annotations();
+       void on_delayed_trace_update();
+       void on_decode_reset();
+       void on_decode_finished();
 
        void on_delete();
 
        void on_channel_selected(int);
 
-       void on_initial_pin_selected(int);
+       void on_channels_updated();
+
+       void on_init_state_changed(int);
 
        void on_stack_decoder(srd_decoder *decoder);
 
@@ -217,9 +208,10 @@ private:
        vector<data::decode::Row> visible_rows_;
        uint64_t decode_start_, decode_end_;
 
+       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
        list< shared_ptr<pv::binding::Decoder> > bindings_;
 
-       list<ChannelSelector> channel_selectors_;
        vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        map<data::decode::Row, int> row_title_widths_;
@@ -228,6 +220,8 @@ private:
        int min_useful_label_width_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
+
+       QTimer delayed_trace_updater_;
 };
 
 } // namespace trace