Moved highlight pen into SelectableItem

[pulseview.git] / pv / view / cursor.cpp

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 3ae5f58a82c9811bc9afef528f1d3025684eb1be..b55d11e016c3b96123b4eb287f44534c51c99034 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -20,13 +20,19 @@
 
 #include "cursor.h"
 
+#include "ruler.h"
 #include "view.h"
 
 #include <QBrush>
 #include <QPainter>
+#include <QPointF>
 #include <QRect>
 #include <QRectF>
 
+#include <stdio.h>
+
+#include <extdef.h>
+
 namespace pv {
 namespace view {
 
@@ -35,27 +41,110 @@ const QColor Cursor::FillColour(52, 101, 164);
 const QColor Cursor::HighlightColour(83, 130, 186);
 const QColor Cursor::TextColour(Qt::white);
 
-const int Cursor::Size = 12;
 const int Cursor::Offset = 1;
 
-Cursor::Cursor(const View &view, double time) :
-       TimeMarker(view, LineColour, time)
+const int Cursor::ArrowSize = 4;
+
+Cursor::Cursor(const View &view, double time, Cursor &other) :
+       TimeMarker(view, LineColour, time),
+       _other(other)
 {
 }
 
-void Cursor::paint_label(QPainter &p, const QRect &rect)
+QRectF Cursor::get_label_rect(const QRect &rect) const
 {
        const float x = (_time - _view.offset()) / _view.scale();
-       const QRectF r(x - Size/2, rect.height() - Size - Offset,
-               Size, Size);
 
-       p.setPen(LineColour);
-       p.setBrush(QBrush(FillColour));
-       p.drawEllipse(r);
+       const QSizeF label_size(
+               _text_size.width() + View::LabelPadding.width() * 2,
+               _text_size.height() + View::LabelPadding.height() * 2);
+       const float top = rect.height() - label_size.height() -
+               Cursor::Offset - Cursor::ArrowSize - 0.5f;
+       const float height = label_size.height();
+
+       if (_time > _other.time())
+               return QRectF(x, top, label_size.width(), height);
+       else
+               return QRectF(x - label_size.width(), top,
+                       label_size.width(), height);
+}
+
+void Cursor::paint_label(QPainter &p, const QRect &rect,
+       unsigned int prefix)
+{
+       compute_text_size(p, prefix);
+       const QRectF r(get_label_rect(rect));
+
+       if (_time > _other.time())
+       {
+               const QPointF points[] = {
+                       r.topLeft(),
+                       r.topRight(),
+                       r.bottomRight(),
+                       QPointF(r.left() + ArrowSize, r.bottom()),
+                       QPointF(r.left(), rect.bottom()),
+               };
+
+               const QPointF highlight_points[] = {
+                       QPointF(r.left() + 1, r.top() + 1),
+                       QPointF(r.right() - 1, r.top() + 1),
+                       QPointF(r.right() - 1, r.bottom() - 1),
+                       QPointF(r.left() + ArrowSize - 1, r.bottom() - 1),
+                       QPointF(r.left() + 1, rect.bottom() - 1),
+               };
+
+               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.setPen(HighlightColour);
+               p.setBrush(Qt::transparent);
+               p.drawPolygon(highlight_points, countof(highlight_points));
+
+               p.setPen(LineColour);
+               p.setBrush(Qt::transparent);
+               p.drawPolygon(points, countof(points));
+       }
+       else
+       {
+               const QPointF points[] = {
+                       r.topRight(),
+                       r.topLeft(),
+                       r.bottomLeft(),
+                       QPointF(r.right() - ArrowSize, r.bottom()),
+                       QPointF(r.right(), rect.bottom()),
+               };
+
+               const QPointF highlight_points[] = {
+                       QPointF(r.right() - 1, r.top() + 1),
+                       QPointF(r.left() + 1, r.top() + 1),
+                       QPointF(r.left() + 1, r.bottom() - 1),
+                       QPointF(r.right() - ArrowSize + 1, r.bottom() - 1),
+                       QPointF(r.right() - 1, rect.bottom() - 1),
+               };
+
+               p.setPen(Qt::transparent);
+               p.setBrush(FillColour);
+               p.drawPolygon(points, countof(points));
+
+               p.setPen(HighlightColour);
+               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,
+               Ruler::format_time(_time, prefix, 2));
+}
+
+void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
+{
+       _text_size = p.boundingRect(QRectF(), 0,
+               Ruler::format_time(_time, prefix, 2)).size();
 }
 
 } // namespace view