Adjusted annotation height

[pulseview.git] / pv / view / decode / annotation.cpp

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 94f1fff5667237e88150abae307dde0ad4521801..7650b29e7715f48f419250ccc4787df1c5d40a02 100644 (file)
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -26,11 +26,12 @@ extern "C" {
 
 #include <algorithm>
 
+#include <boost/foreach.hpp>
+
 #include <QPainter>
 
 #include "annotation.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -52,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++;
@@ -66,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 -