X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=f644b8af3a3356e03db91af8b948119e2cb4be17;hp=19f11399fec78bae58fc809d71bfb6b0aded71d1;hb=HEAD;hpb=cbb2e4da8042495531b406f745ee9d9e20448ef6

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 19f11399..ebcbc1c9 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -36,19 +36,81 @@ namespace pv {
 namespace data {
 namespace decode {
 
-Decoder::Decoder(const srd_decoder *const dec) :
+AnnotationClass::AnnotationClass(size_t _id, char* _name, char* _description, Row* _row) :
+	id(_id),
+	name(_name),
+	description(_description),
+	row(_row),
+	visible_(true)
+{
+}
+
+bool AnnotationClass::visible() const
+{
+	return visible_;
+}
+
+void AnnotationClass::set_visible(bool visible)
+{
+	visible_ = visible;
+
+	visibility_changed();
+}
+
+
+Decoder::Decoder(const srd_decoder *const dec, uint8_t stack_level) :
 	srd_decoder_(dec),
-	shown_(true),
+	stack_level_(stack_level),
+	visible_(true),
 	decoder_inst_(nullptr)
 {
-	// Query the decoder outputs
+	// 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_.emplace_back(i++, name, desc, nullptr);
+
+		connect(&(ann_classes_.back()), SIGNAL(visibility_changed()),
+			this, SLOT(on_class_visibility_changed()));
+	}
+
+	// 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++;
+
+	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_.emplace_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());
+
+		connect(&(rows_.back()), SIGNAL(visibility_changed()),
+			this, SLOT(on_row_visibility_changed()));
+	}
+
+	if (rows_.empty()) {
+		// Make sure there is a row for PDs without row declarations
+		rows_.emplace_back(0, this);
+
+		for (AnnotationClass& c : ann_classes_)
+			c.row = &(rows_.back());
+	}
 }
 
 Decoder::~Decoder()
@@ -57,24 +119,31 @@ Decoder::~Decoder()
 		g_variant_unref(option.second);
 }
 
-const srd_decoder* Decoder::decoder() const
+const srd_decoder* Decoder::get_srd_decoder() const
 {
 	return srd_decoder_;
 }
 
+uint8_t Decoder::get_stack_level() const
+{
+	return stack_level_;
+}
+
 const char* Decoder::name() const
 {
 	return srd_decoder_->name;
 }
 
-bool Decoder::shown() const
+bool Decoder::visible() const
 {
-	return shown_;
+	return visible_;
 }
 
-void Decoder::show(bool show)
+void Decoder::set_visible(bool visible)
 {
-	shown_ = show;
+	visible_ = visible;
+
+	annotation_visibility_changed();
 }
 
 const vector<DecodeChannel*>& Decoder::channels() const
@@ -184,6 +253,60 @@ 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;
+}
+
+vector<AnnotationClass*> Decoder::ann_classes()
+{
+	vector<AnnotationClass*> result;
+
+	for (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]);
+}
+
+const AnnotationClass* Decoder::get_ann_class_by_id(size_t id) const
+{
+	if (id >= ann_classes_.size())
+		return nullptr;
+
+	return &(ann_classes_[id]);
+}
+
 uint32_t Decoder::get_binary_class_count() const
 {
 	return bin_classes_.size();
@@ -194,6 +317,36 @@ const DecodeBinaryClassInfo* Decoder::get_binary_class(uint32_t id) const
 	return &(bin_classes_.at(id));
 }
 
+void Decoder::on_row_visibility_changed()
+{
+	annotation_visibility_changed();
+}
+
+void Decoder::on_class_visibility_changed()
+{
+	annotation_visibility_changed();
+}
+
+bool Decoder::has_logic_output() const
+{
+	return (srd_decoder_->logic_output_channels != nullptr);
+}
+
+const vector<DecoderLogicOutputChannel> Decoder::logic_output_channels() const
+{
+	vector<DecoderLogicOutputChannel> result;
+
+	for (GSList *l = srd_decoder_->logic_output_channels; l; l = l->next) {
+		const srd_decoder_logic_output_channel* ch_data =
+			(srd_decoder_logic_output_channel*)l->data;
+
+		result.emplace_back(QString::fromUtf8(ch_data->id),
+			QString::fromUtf8(ch_data->desc));
+	}
+
+	return result;
+}
+
 }  // namespace decode
 }  // namespace data
 }  // namespace pv