Add row colors and some fixes

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

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index 7e12533ed2b61e5b634acebac45fe194f88f34c4..0434e1c0d8aad7a2d93e2ecf26555377ff6fb62f 100644 (file)
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cassert>
+
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
@@ -34,6 +36,11 @@ RowData::RowData(Row* row) :
        assert(row);
 }
 
+const Row* RowData::row() const
+{
+       return row_;
+}
+
 uint64_t RowData::get_max_sample() const
 {
        if (annotations_.empty())
@@ -47,7 +54,7 @@ uint64_t RowData::get_annotation_count() const
 }
 
 void RowData::get_annotation_subset(
-       vector<const pv::data::decode::Annotation*> &dest,
+       deque<const pv::data::decode::Annotation*> &dest,
        uint64_t start_sample, uint64_t end_sample) const
 {
        // Determine whether we must apply per-class filtering or not
@@ -66,7 +73,6 @@ void RowData::get_annotation_subset(
 
        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))
@@ -80,9 +86,8 @@ void RowData::get_annotation_subset(
                                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()]) &&
+                               if ((class_visible[annotation.ann_class_id()]) &&
                                        (annotation.end_sample() > start_sample) &&
                                        (annotation.start_sample() <= end_sample))
                                        dest.push_back(&annotation);
@@ -90,8 +95,36 @@ void RowData::get_annotation_subset(
        }
 }
 
-void RowData::emplace_annotation(srd_proto_data *pdata)
+const deque<Annotation>& RowData::annotations() const
+{
+       return annotations_;
+}
+
+const Annotation* RowData::emplace_annotation(srd_proto_data *pdata)
 {
+       const srd_proto_data_annotation *const pda = (const srd_proto_data_annotation*)pdata->data;
+
+       Annotation::Class ann_class_id = (Annotation::Class)(pda->ann_class);
+
+       // Look up the longest annotation text to see if we have it in storage.
+       // This implies that if the longest text is the same, the shorter texts
+       // are expected to be the same, too. PDs that violate this assumption
+       // should be considered broken.
+       const char* const* ann_texts = (char**)pda->ann_text;
+       const QString ann0 = QString::fromUtf8(ann_texts[0]);
+       vector<QString>* storage_entry = &(ann_texts_[ann0]);
+
+       if (storage_entry->empty()) {
+               while (*ann_texts) {
+                       storage_entry->emplace_back(QString::fromUtf8(*ann_texts));
+                       ann_texts++;
+               }
+               storage_entry->shrink_to_fit();
+       }
+
+
+       const Annotation* result = nullptr;
+
        // 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
@@ -108,11 +141,17 @@ void RowData::emplace_annotation(srd_proto_data *pdata)
                if (it != annotations_.begin())
                        it++;
 
-               annotations_.insert(it, Annotation(pdata, row_));
+               it = annotations_.emplace(it, pdata->start_sample, pdata->end_sample,
+                       storage_entry, ann_class_id, this);
+               result = &(*it);
        } else {
-               annotations_.emplace_back(pdata, row_);
+               annotations_.emplace_back(pdata->start_sample, pdata->end_sample,
+                       storage_entry, ann_class_id, this);
+               result = &(annotations_.back());
                prev_ann_start_sample_ = pdata->start_sample;
        }
+
+       return result;
 }
 
 }  // namespace decode