Draw stacked decoder traces below the other PDs (avoids overlap).

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f08e349240571cabf18f64259ca205daaef8bcb1..645b92f32474d44aafcde927023bc5c4f36fd60b 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -241,13 +241,41 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
        using pv::data::decode::Annotation;
 
+       GSList *l, *ll;
+       int row, ann_class, idx = 0;
+       struct srd_decoder_annotation_row *ann_row;
+       struct srd_decoder *decc;
+
        assert(pdata);
        assert(decoder);
 
        DecoderStack *const d = (DecoderStack*)decoder;
 
        lock_guard<mutex> lock(d->_mutex);
-       d->_annotations.push_back(Annotation(pdata));
+
+       Annotation a = Annotation(pdata);
+
+       decc = pdata->pdo->di->decoder;
+       BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, d->stack()) {
+               if (dec->decoder() == decc)
+                       break;
+               idx++;
+       }
+       a.set_pd_index(idx);
+
+       for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
+       {
+               ann_row = (struct srd_decoder_annotation_row *)l->data;
+
+               for (ll = ann_row->ann_classes, ann_class = 0; ll;
+                                       ll = ll->next, ann_class++)
+               {
+                       if (GPOINTER_TO_INT(ll->data) == a.format())
+                               a.set_row(row);
+               }
+       }
+
+       d->_annotations.push_back(a);
 
        d->new_decode_data();
 }