projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6d8b056
)
pv::view::DecodeTrace: Draw annotation rows according to PD metadata.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Fri, 31 Jan 2014 20:29:56 +0000
(21:29 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 1 Feb 2014 14:08:05 +0000
(15:08 +0100)
pv/view/decodetrace.cpp
patch
|
blob
|
history
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 37beed98779d73fb8043567cb48d5beeff18e25c..8c230ad42384cc093ba094ac9bd401377997061d 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-155,9
+155,15
@@
void DecodeTrace::paint_mid(QPainter &p, int left, int right)
assert(_decoder_stack);
vector<Annotation> annotations(_decoder_stack->annotations());
assert(_decoder_stack);
vector<Annotation> annotations(_decoder_stack->annotations());
- BOOST_FOREACH(const Annotation &a, annotations)
+
+ BOOST_FOREACH(const Annotation &a, annotations) {
+ // Every annotation row is 20 pixels further down.
+ int y_ann_row_offset = a.row() * 20;
+
draw_annotation(a, p, get_text_colour(), h, left, right,
draw_annotation(a, p, get_text_colour(), h, left, right,
- samples_per_pixel, pixels_offset, y);
+ samples_per_pixel, pixels_offset,
+ y + y_ann_row_offset);
+ }
draw_unresolved_period(p, h, left, right,
samples_per_pixel, pixels_offset);
draw_unresolved_period(p, h, left, right,
samples_per_pixel, pixels_offset);