X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=80d56aabb41c8fda4da8a89fc795241638ba4563;hb=d67b0972db76d04326ec0ae777776589a0da209a;hp=9402e707503e63772c9c18a39d5ea98415ed433e;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 9402e707..80d56aab 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -14,11 +14,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include "rowdata.hpp"
+#include
+
+#include
+#include
+#include
using std::vector;
@@ -26,8 +29,11 @@ namespace pv {
namespace data {
namespace decode {
-RowData::RowData()
+RowData::RowData(Row* row) :
+ row_(row),
+ prev_ann_start_sample_(0)
{
+ assert(row);
}
uint64_t RowData::get_max_sample() const
@@ -37,21 +43,80 @@ 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,
+ vector &dest,
uint64_t start_sample, uint64_t end_sample) const
{
- for (auto i = annotations_.cbegin(); i != annotations_.cend(); i++)
- if ((*i).end_sample() > start_sample &&
- (*i).start_sample() <= end_sample)
- dest.push_back(*i);
+ // 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
+ dest.reserve(dest.size() + annotations_.size());
+ 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;
+
+ dest.reserve(dest.size() + annotations_.size());
+ 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::push_annotation(const Annotation &a)
+void RowData::emplace_annotation(srd_proto_data *pdata)
{
- annotations_.push_back(a);
+ // We insert the annotation in a way so that the annotation list
+ // is sorted by start sample. Otherwise, we'd have to sort when
+ // painting, which is expensive
+
+ if (pdata->start_sample < prev_ann_start_sample_) {
+ // Find location to insert the annotation at
+
+ auto it = annotations_.end();
+ do {
+ it--;
+ } while ((it->start_sample() > pdata->start_sample) && (it != annotations_.begin()));
+
+ // Allow inserting at the front
+ if (it != annotations_.begin())
+ it++;
+
+ annotations_.insert(it, Annotation(pdata, row_));
+ } else {
+ annotations_.emplace_back(pdata, row_);
+ prev_ann_start_sample_ = pdata->start_sample;
+ }
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv