TabularDecView: Make the model/view work

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

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 2a7ef11ea14365fe8947e41154d493a3d46d9425..7b1a20134acaccd7ce4adec6462d11a02c11ffcb 100644 (file)
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <pv/data/signalbase.hpp>
+#include <pv/data/decode/row.hpp>
 
 using std::map;
 using std::string;
@@ -49,6 +50,15 @@ 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
@@ -63,7 +73,7 @@ struct DecodeChannel
 
 struct DecodeBinaryClassInfo
 {
-       uint8_t bin_class_id;
+       uint32_t bin_class_id;
        char* name;
        char* description;
 };
@@ -72,22 +82,23 @@ struct DecodeBinaryClassInfo
 class Decoder
 {
 public:
-       Decoder(const srd_decoder *const dec);
+       Decoder(const srd_decoder *const dec, uint8_t stack_level);
 
        virtual ~Decoder();
 
-       const srd_decoder* decoder() const;
+       const srd_decoder* get_srd_decoder() const;
+
+       uint8_t get_stack_level() const;
 
        const char* name() const;
 
-       bool shown() const;
-       void show(bool show = true);
+       bool visible() const;
+       void set_visible(bool visible);
 
        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();
@@ -97,15 +108,26 @@ public:
        srd_decoder_inst* create_decoder_inst(srd_session *session);
        void invalidate_decoder_inst();
 
-       uint8_t get_binary_class_count() const;
-       const DecodeBinaryClassInfo* get_binary_class(uint8_t id) const;
+       vector<Row*> get_rows();
+       Row* get_row_by_id(size_t id);
+
+       vector<const AnnotationClass*> ann_classes() const;
+       vector<AnnotationClass*> ann_classes();
+       AnnotationClass* get_ann_class_by_id(size_t id);
+       const AnnotationClass* get_ann_class_by_id(size_t id) const;
+
+       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_;
+       uint8_t stack_level_;
 
-       bool shown_;
+       bool visible_;
 
        vector<DecodeChannel*> channels_;
+       vector<Row> rows_;
+       vector<AnnotationClass> ann_classes_;
        vector<DecodeBinaryClassInfo> bin_classes_;
        map<string, GVariant*> options_;
        srd_decoder_inst *decoder_inst_;