Rework decoder infrastructure

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

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index d3d14f9bd56fb7d2b3c275f5185775ca12dceab8..c1efdde4f16f07bb7a6f55ddb751b8a8e44cbaa5 100644 (file)
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -17,7 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rowdata.hpp"
+#include <pv/data/decode/decoder.hpp>
+#include <pv/data/decode/row.hpp>
+#include <pv/data/decode/rowdata.hpp>
 
 using std::vector;
 
@@ -25,6 +27,12 @@ namespace pv {
 namespace data {
 namespace decode {
 
+RowData::RowData(Row* row) :
+       row_(row)
+{
+       assert(row);
+}
+
 uint64_t RowData::get_max_sample() const
 {
        if (annotations_.empty())
@@ -41,15 +49,47 @@ void RowData::get_annotation_subset(
        vector<pv::data::decode::Annotation> &dest,
        uint64_t start_sample, uint64_t end_sample) const
 {
-       for (const auto& annotation : annotations_)
-               if (annotation.end_sample() > start_sample &&
-                       annotation.start_sample() <= end_sample)
-                       dest.push_back(annotation);
+       // Determine whether we must apply per-class filtering or not
+       bool all_ann_classes_enabled = true;
+       bool all_ann_classes_disabled = true;
+
+       uint32_t max_ann_class_id = 0;
+       for (AnnotationClass* c : row_->ann_classes()) {
+               if (!c->visible)
+                       all_ann_classes_enabled = false;
+               else
+                       all_ann_classes_disabled = false;
+               if (c->id > max_ann_class_id)
+                       max_ann_class_id = c->id;
+       }
+
+       if (all_ann_classes_enabled) {
+               // No filtering, send everyting out as-is
+               for (const auto& annotation : annotations_)
+                       if ((annotation.end_sample() > start_sample) &&
+                               (annotation.start_sample() <= end_sample))
+                               dest.push_back(annotation);
+       } else {
+               if (!all_ann_classes_disabled) {
+                       // Filter out invisible annotation classes
+                       vector<size_t> class_visible;
+                       class_visible.resize(max_ann_class_id + 1, 0);
+                       for (AnnotationClass* c : row_->ann_classes())
+                               if (c->visible)
+                                       class_visible[c->id] = 1;
+
+                       for (const auto& annotation : annotations_)
+                               if ((annotation.end_sample() > start_sample) &&
+                                       (annotation.start_sample() <= end_sample) &&
+                                       (class_visible[annotation.ann_class()]))
+                                       dest.push_back(annotation);
+               }
+       }
 }
 
-void RowData::emplace_annotation(srd_proto_data *pdata, const Row *row)
+void RowData::emplace_annotation(srd_proto_data *pdata)
 {
-       annotations_.emplace_back(pdata, row);
+       annotations_.emplace_back(pdata, row_);
 }
 
 }  // namespace decode