Adjust trace view header width when signal names change

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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 04f3b77f45c3393d2bc3fa378929588cff41adc5..dd2ad79dbb790f0553220fe34fbb211ba710ca2f 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -148,10 +148,12 @@ private:
 
        void connect_input_notifiers();
 
+       void prepare_annotation_segment();
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
        void new_annotations();
+       void decode_reset();
        void decode_finished();
        void channels_updated();
 
@@ -168,7 +170,7 @@ private:
        struct srd_session *srd_session_;
 
        shared_ptr<Logic> logic_mux_data_;
-       shared_ptr<LogicSegment> segment_;
+       shared_ptr<LogicSegment> logic_mux_segment_;
        bool logic_mux_data_invalid_;
 
        pv::util::Timestamp start_time_;
@@ -177,9 +179,14 @@ private:
        int64_t samples_decoded_;
 
        vector< shared_ptr<decode::Decoder> > stack_;
-       map<const decode::Row, decode::RowData> rows_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
+       /// Annotations for all segments
+       vector< map<const decode::Row, decode::RowData>> rows_;
+
+       /// Set of annotations for current segment
+       map<const decode::Row, decode::RowData> *current_rows_;
+
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;
        bool frame_complete_;