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++;
}
}
-void Annotation::paint(QPainter &p, QColor text_color, int text_height,
+void Annotation::paint(QPainter &p, QColor text_color, int h,
int left, int right, double samples_per_pixel, double pixels_offset,
int y)
{
- const int h = (text_height * 3) / 2;
const double start = _start_sample / samples_per_pixel -
pixels_offset;
const double end = _end_sample / samples_per_pixel -
void Annotation::draw_range(QPainter &p, QColor fill, QColor outline,
QColor text_color, int h, double start, double end, int y)
{
+ const double top = y + .5 - h / 2;
+ const double bottom = y + .5 + h / 2;
+
+ p.setPen(outline);
+ p.setBrush(fill);
+
+ // If the two ends are within 1 pixel, draw a vertical line
+ if (start + 1.0 > end)
+ {
+ p.drawLine(QPointF(start, top), QPointF(start, bottom));
+ return;
+ }
+
const double cap_width = min((end - start) / 2, EndCapWidth);
QPointF pts[] = {
QPointF(start, y + .5f),
- QPointF(start + cap_width, y + .5f - h / 2),
- QPointF(end - cap_width, y + .5f - h / 2),
+ QPointF(start + cap_width, top),
+ QPointF(end - cap_width, top),
QPointF(end, y + .5f),
- QPointF(end - cap_width, y + .5f + h / 2),
- QPointF(start + cap_width, y + .5f + h / 2)
+ QPointF(end - cap_width, bottom),
+ QPointF(start + cap_width, bottom)
};
- p.setPen(outline);
- p.setBrush(fill);
p.drawConvexPolygon(pts, countof(pts));
if (_annotations.empty())