X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecode%2Fannotation.cpp;h=7650b29e7715f48f419250ccc4787df1c5d40a02;hb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;hp=339b46afb0b36fb11600fae64d87c6b7038461fb;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496;p=pulseview.git

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 339b46af..7650b29e 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -53,10 +53,14 @@ const QColor Annotation::Colours[7] = {
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
 	_start_sample(pdata->start_sample),
-	_end_sample(pdata->end_sample),
-	_format(pdata->ann_format)
+	_end_sample(pdata->end_sample)
 {
-	const char *const *annotations = (char**)pdata->data;
+	assert(pdata);
+	const srd_proto_data_annotation *const pda =
+		(const srd_proto_data_annotation*)pdata->data;
+	assert(pda);
+
+	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
 		_annotations.push_back(QString(*annotations));
 		annotations++;
@@ -67,7 +71,7 @@ void Annotation::paint(QPainter &p, QColor text_color, int text_height,
 	int left, int right, double samples_per_pixel, double pixels_offset,
 	int y)
 {
-	const int h = (text_height * 3) / 2;
+	const int h = (text_height * 5) / 4;
 	const double start = _start_sample / samples_per_pixel -
 		pixels_offset;
 	const double end = _end_sample / samples_per_pixel -