X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=83a8021ef5a11136f747b02ac2724644ac7eb280;hb=81dc02212c05c99554194a15f9b584e6b500cda9;hp=aff4a26b333b68b2672af073c87b8ad5c392d406;hpb=1becee23bdd2b44145b753edd05bf01f7fb0707e;p=pulseview.git
diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index aff4a26b..83a8021e 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -17,7 +17,9 @@
* along with this program; if not, see .
*/
-#include "rowdata.hpp"
+#include
+#include
+#include
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())
@@ -32,19 +40,56 @@ uint64_t RowData::get_max_sample() const
return annotations_.back().end_sample();
}
+uint64_t RowData::get_annotation_count() const
+{
+ return annotations_.size();
+}
+
void RowData::get_annotation_subset(
vector &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 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 ((class_visible[annotation.ann_class()]) &&
+ (annotation.end_sample() > start_sample) &&
+ (annotation.start_sample() <= end_sample))
+ dest.push_back(annotation);
+ }
+ }
}
void RowData::emplace_annotation(srd_proto_data *pdata)
{
- annotations_.emplace_back(pdata);
+ annotations_.emplace_back(pdata, row_);
}
} // namespace decode