X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=3769f8898f18fc7736691c4288fde9b175f5c206;hb=81dc02212c05c99554194a15f9b584e6b500cda9;hp=c6995bcf703a56cb13b4ba347acb2c61aa11d17e;hpb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index c6995bcf..3769f889 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -29,7 +29,6 @@
 #include <pv/data/signalbase.hpp>
 #include <pv/data/decodesignal.hpp>
 
-using pv::data::DecodeChannel;
 using std::map;
 using std::string;
 
@@ -38,10 +37,48 @@ namespace data {
 namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
-	decoder_(dec),
+	srd_decoder_(dec),
 	shown_(true),
 	decoder_inst_(nullptr)
 {
+	// Query the annotation output classes
+	uint32_t i = 0;
+	for (GSList *l = dec->annotations; l; l = l->next) {
+		char **ann_class = (char**)l->data;
+		char *name = ann_class[0];
+		char *desc = ann_class[1];
+		ann_classes_.push_back({i++, name, desc, nullptr, true}); // Visible by default
+	}
+
+	// Query the binary output classes
+	i = 0;
+	for (GSList *l = dec->binary; l; l = l->next) {
+		char **bin_class = (char**)l->data;
+		char *name = bin_class[0];
+		char *desc = bin_class[1];
+		bin_classes_.push_back({i++, name, desc});
+	}
+
+	// Query the annotation rows and reference them by the classes that use them
+	uint32_t row_count = 0;
+	for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next)
+		row_count++;
+	rows_.reserve(row_count);
+
+	i = 0;
+	for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next) {
+		const srd_decoder_annotation_row *const srd_row = (srd_decoder_annotation_row *)rl->data;
+		assert(srd_row);
+		rows_.push_back({i++, this, srd_row});
+
+		// FIXME PV can crash from .at() if a PD's ann classes are defined incorrectly
+		for (const GSList *cl = srd_row->ann_classes; cl; cl = cl->next)
+			ann_classes_.at((size_t)cl->data).row = &(rows_.back());
+	}
+
+	if (rows_.empty())
+		// Make sure there is a row for PDs without row declarations
+		rows_.emplace_back(0, this);
 }
 
 Decoder::~Decoder()
@@ -50,9 +87,14 @@ Decoder::~Decoder()
 		g_variant_unref(option.second);
 }
 
-const srd_decoder* Decoder::decoder() const
+const srd_decoder* Decoder::get_srd_decoder() const
 {
-	return decoder_;
+	return srd_decoder_;
+}
+
+const char* Decoder::name() const
+{
+	return srd_decoder_->name;
 }
 
 bool Decoder::shown() const
@@ -87,12 +129,21 @@ void Decoder::set_option(const char *id, GVariant *value)
 	options_[id] = value;
 
 	// If we have a decoder instance, apply option value immediately
+	apply_all_options();
+}
+
+void Decoder::apply_all_options()
+{
 	if (decoder_inst_) {
 		GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 			g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-		g_variant_ref(value);
-		g_hash_table_insert(opt_hash, (void*)g_strdup(id), value);
+		for (const auto& option : options_) {
+			GVariant *const value = option.second;
+			g_variant_ref(value);
+			g_hash_table_replace(opt_hash, (void*)g_strdup(
+				option.first.c_str()), value);
+		}
 
 		srd_inst_option_set(decoder_inst_, opt_hash);
 		g_hash_table_destroy(opt_hash);
@@ -123,7 +174,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)
 	if (decoder_inst_)
 		qDebug() << "WARNING: previous decoder instance" << decoder_inst_ << "exists";
 
-	decoder_inst_ = srd_inst_new(session, decoder_->id, opt_hash);
+	decoder_inst_ = srd_inst_new(session, srd_decoder_->id, opt_hash);
 	g_hash_table_destroy(opt_hash);
 
 	if (!decoder_inst_)
@@ -163,6 +214,52 @@ void Decoder::invalidate_decoder_inst()
 	decoder_inst_ = nullptr;
 }
 
+vector<Row*> Decoder::get_rows()
+{
+	vector<Row*> result;
+
+	for (Row& row : rows_)
+		result.push_back(&row);
+
+	return result;
+}
+
+Row* Decoder::get_row_by_id(size_t id)
+{
+	if (id > rows_.size())
+		return nullptr;
+
+	return &(rows_[id]);
+}
+
+vector<const AnnotationClass*> Decoder::ann_classes() const
+{
+	vector<const AnnotationClass*> result;
+
+	for (const AnnotationClass& c : ann_classes_)
+		result.push_back(&c);
+
+	return result;
+}
+
+AnnotationClass* Decoder::get_ann_class_by_id(size_t id)
+{
+	if (id >= ann_classes_.size())
+		return nullptr;
+
+	return &(ann_classes_[id]);
+}
+
+uint32_t Decoder::get_binary_class_count() const
+{
+	return bin_classes_.size();
+}
+
+const DecodeBinaryClassInfo* Decoder::get_binary_class(uint32_t id) const
+{
+	return &(bin_classes_.at(id));
+}
+
 }  // namespace decode
 }  // namespace data
 }  // namespace pv