DecodeTrace: Highlight row expand markers when a class is hidden

[pulseview.git] / pv / data / decode / decoder.hpp

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 1b323f0b74dc0b7b8de2d1b87605b6f0d39ca851..4baf86a026aeb4b62bf140f6af273ebae8d4156c 100644 (file)
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -23,13 +23,16 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <vector>
 
 #include <glib.h>
 
+#include <pv/data/signalbase.hpp>
+#include <pv/data/decode/row.hpp>
+
 using std::map;
-using std::set;
-using std::shared_ptr;
 using std::string;
+using std::vector;
 
 struct srd_decoder;
 struct srd_decoder_inst;
@@ -45,6 +48,37 @@ class SignalBase;
 
 namespace decode {
 
+class Decoder;
+
+struct AnnotationClass
+{
+       size_t id;
+       char* name;
+       char* description;
+       Row* row;
+       bool visible;
+};
+
+struct DecodeChannel
+{
+       uint16_t id;     ///< Global numerical ID for the decode channels in the stack
+       uint16_t bit_id; ///< Tells which bit within a sample represents this channel
+       const bool is_optional;
+       const pv::data::SignalBase *assigned_signal;
+       const QString name, desc;
+       int initial_pin_state;
+       const shared_ptr<Decoder> decoder_;
+       const srd_channel *pdch_;
+};
+
+struct DecodeBinaryClassInfo
+{
+       uint32_t bin_class_id;
+       char* name;
+       char* description;
+};
+
+
 class Decoder
 {
 public:
@@ -52,34 +86,47 @@ public:
 
        virtual ~Decoder();
 
-       const srd_decoder* decoder() const;
+       const srd_decoder* get_srd_decoder() const;
+
+       const char* name() const;
 
        bool shown() const;
        void show(bool show = true);
 
-       const map<const srd_channel*,
-               shared_ptr<data::SignalBase> >& channels() const;
-       void set_channels(map<const srd_channel*,
-               shared_ptr<data::SignalBase> > channels);
+       const vector<DecodeChannel*>& channels() const;
+       void set_channels(vector<DecodeChannel*> channels);
 
        const map<string, GVariant*>& options() const;
 
        void set_option(const char *id, GVariant *value);
 
+       void apply_all_options();
+
        bool have_required_channels() const;
 
-       srd_decoder_inst* create_decoder_inst(
-               srd_session *session) const;
+       srd_decoder_inst* create_decoder_inst(srd_session *session);
+       void invalidate_decoder_inst();
+
+       vector<Row*> get_rows();
+       Row* get_row_by_id(size_t id);
+
+       vector<const AnnotationClass*> ann_classes() const;
+       AnnotationClass* get_ann_class_by_id(size_t id);
 
-       set< shared_ptr<pv::data::Logic> > get_data();
+       uint32_t get_binary_class_count() const;
+       const DecodeBinaryClassInfo* get_binary_class(uint32_t id) const;
 
 private:
-       const srd_decoder *const decoder_;
+       const srd_decoder* const srd_decoder_;
 
        bool shown_;
 
-       map<const srd_channel*, shared_ptr<pv::data::SignalBase> > channels_;
+       vector<DecodeChannel*> channels_;
+       vector<Row> rows_;
+       vector<AnnotationClass> ann_classes_;
+       vector<DecodeBinaryClassInfo> bin_classes_;
        map<string, GVariant*> options_;
+       srd_decoder_inst *decoder_inst_;
 };
 
 } // namespace decode