DecodeTrace: Highlight row expand markers when a class is hidden

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

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index c8d68df6cb317a1bcdefd778bee970bf4b1f0e29..83a8021ef5a11136f747b02ac2724644ac7eb280 100644 (file)
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -14,11 +14,12 @@
  * 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 <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;
 
@@ -26,8 +27,10 @@ namespace pv {
 namespace data {
 namespace decode {
 
-RowData::RowData()
+RowData::RowData(Row* row) :
+       row_(row)
 {
+       assert(row);
 }
 
 uint64_t RowData::get_max_sample() const
@@ -37,21 +40,58 @@ 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<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 ((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);
+       annotations_.emplace_back(pdata, row_);
 }
 
-} // decode
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv