Session: Fix issue #67 by improving error handling

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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 0f12fec8bd753024c53c859f4a44427bfb7a5f81..ebcbc1c9bfa45a2c25e297becd0e243910f90596 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -36,8 +36,31 @@ 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),
+       stack_level_(stack_level),
        visible_(true),
        decoder_inst_(nullptr)
 {
@@ -47,7 +70,10 @@ Decoder::Decoder(const srd_decoder *const dec) :
                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
+               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
@@ -63,7 +89,6 @@ Decoder::Decoder(const srd_decoder *const dec) :
        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) {
@@ -74,6 +99,9 @@ Decoder::Decoder(const srd_decoder *const dec) :
                // 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()) {
@@ -96,6 +124,11 @@ 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;
@@ -109,6 +142,8 @@ bool Decoder::visible() const
 void Decoder::set_visible(bool visible)
 {
        visible_ = visible;
+
+       annotation_visibility_changed();
 }
 
 const vector<DecodeChannel*>& Decoder::channels() const
@@ -264,6 +299,14 @@ AnnotationClass* Decoder::get_ann_class_by_id(size_t id)
        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();
@@ -274,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