Initial code to render text inside cursor markers

diff --git a/pv/signal.cpp b/pv/signal.cpp
index c23a3954455b155d74b042907c361fa245f18c3a..bcb328136826d42a1451e149af6a1cbe32054923 100644 (file)
--- a/pv/signal.cpp
+++ b/pv/signal.cpp
@@ -21,6 +21,7 @@
 #include <extdef.h>
 
 #include "signal.h"
+#include "view/view.h"
 
 namespace pv {
 

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index b854f2c4995be4a3f93a205f0b2c43c67bcbc534..35c2ed45fc0d564486140a91d8fb63225ae19bb2 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -24,9 +24,14 @@
 
 #include <QBrush>
 #include <QPainter>
+#include <QPointF>
 #include <QRect>
 #include <QRectF>
 
+#include <stdio.h>
+
+#include <extdef.h>
+
 namespace pv {
 namespace view {
 
@@ -38,6 +43,8 @@ const QColor Cursor::TextColour(Qt::white);
 const int Cursor::Size = 12;
 const int Cursor::Offset = 1;
 
+const int Cursor::ArrowSize = 4;
+
 Cursor::Cursor(const View &view, double time) :
        TimeMarker(view, LineColour, time)
 {
@@ -46,21 +53,70 @@ Cursor::Cursor(const View &view, double time) :
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
        const float x = (_time - _view.offset()) / _view.scale();
-       return QRectF(x - Size/2, rect.height() - Size - Offset,
-               Size, Size);
+
+       const QSizeF label_size(
+               _text_size.width() + View::LabelPadding.width() * 2,
+               _text_size.height() + View::LabelPadding.height() * 2);
+       return QRectF(x - label_size.width() / 2 - 0.5f,
+               rect.height() - label_size.height() - Offset - ArrowSize - 0.5f,
+               label_size.width() + 1, label_size.height() + 1);
 }
 
 void Cursor::paint_label(QPainter &p, const QRect &rect)
 {
+       compute_text_size(p);
        const QRectF r(get_label_rect(rect));
 
-       p.setPen(LineColour);
-       p.setBrush(QBrush(FillColour));
-       p.drawEllipse(r);
+       const float h_centre = (r.left() + r.right()) / 2;
+       const QPointF points[] = {
+               r.topRight(),
+               QPointF(r.right(), r.bottom()),
+               QPointF(h_centre + ArrowSize, r.bottom()),
+               QPointF(h_centre, rect.bottom()),
+               QPointF(h_centre - ArrowSize, r.bottom()),
+               QPointF(r.left(), r.bottom()),
+               r.topLeft()
+       };
+
+       const QPointF highlight_points[] = {
+               QPointF(r.right() - 1, r.top() + 1),
+               QPointF(r.right() - 1, r.bottom() - 1),
+               QPointF(h_centre + ArrowSize - 1, r.bottom() - 1),
+               QPointF(h_centre, rect.bottom() - 1),
+               QPointF(h_centre - ArrowSize + 1, r.bottom() - 1),
+               QPointF(r.left() + 1, r.bottom() - 1),
+               QPointF(r.left() + 1, r.top() + 1),
+       };
+
+       char text[16];
+       format_text(text);
+
+       p.setPen(Qt::transparent);
+       p.setBrush(FillColour);
+       p.drawPolygon(points, countof(points));
 
        p.setPen(HighlightColour);
-       p.setBrush(QBrush());
-       p.drawEllipse(r.adjusted(1, 1, -1, -1));
+       p.setBrush(Qt::transparent);
+       p.drawPolygon(highlight_points, countof(highlight_points));
+
+       p.setPen(LineColour);
+       p.setBrush(Qt::transparent);
+       p.drawPolygon(points, countof(points));
+
+       p.setPen(TextColour);
+       p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, text);
+}
+
+void Cursor::compute_text_size(QPainter &p)
+{
+       char text[16];
+       format_text(text);
+       _text_size = p.boundingRect(QRectF(), 0, text).size();
+}
+
+void Cursor::format_text(char *text)
+{
+       sprintf(text, "%gs", _time);
 }
 
 } // namespace view

diff --git a/pv/view/cursor.h b/pv/view/cursor.h
index 3ee0200518108a30e52ef7b20b7ced7108d92386..1469f2cc1edf0db599f8b6f147cabbb4fd235abd 100644 (file)
--- a/pv/view/cursor.h
+++ b/pv/view/cursor.h
@@ -23,6 +23,10 @@
 
 #include "timemarker.h"
 
+#include <QSizeF>
+
+class QPainter;
+
 namespace pv {
 namespace view {
 
@@ -34,10 +38,13 @@ private:
        static const QColor LineColour;
        static const QColor FillColour;
        static const QColor HighlightColour;
+       static const QColor TextColour;
 
        static const int Size;
        static const int Offset;
 
+       static const int ArrowSize;
+
 public:
        /**
         * Constructor.
@@ -60,6 +67,14 @@ public:
         * @param rect The rectangle of the ruler client area.
         */
        void paint_label(QPainter &p, const QRect &rect);
+
+private:
+       void compute_text_size(QPainter &p);
+
+       void format_text(char *text);
+
+private:
+       QSizeF _text_size;
 };
 
 } // namespace view

diff --git a/pv/view/timemarker.h b/pv/view/timemarker.h
index 08ed93890b6e4f8647e1855b08162f133387955f..e8dac5d470792c1234e0708369ff6c69c2f9921d 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -91,6 +91,8 @@ protected:
        const QColor &_colour;
 
        double _time;
+
+       QSizeF _text_size;
 };
 
 } // namespace view