Made TimeMarker::_view a non-const reference

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 1ec3b37a9948cf31d4d492c2af80973685d615b9..1b30518e04024225586f8e7dbfcc073a57891989 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -33,6 +33,8 @@
 
 #include <extdef.h>
 
+using namespace boost;
+
 namespace pv {
 namespace view {
 
@@ -45,61 +47,95 @@ const int Cursor::Offset = 1;
 
 const int Cursor::ArrowSize = 4;
 
-Cursor::Cursor(const View &view, double time) :
+Cursor::Cursor(View &view, double time) :
        TimeMarker(view, LineColour, time)
 {
 }
 
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
+       const shared_ptr<Cursor> other(get_other_cursor());
+       assert(other);
+
        const float x = (_time - _view.offset()) / _view.scale();
 
        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);
+       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)
 {
+       const shared_ptr<Cursor> other(get_other_cursor());
+       assert(other);
+
        compute_text_size(p, prefix);
        const QRectF r(get_label_rect(rect));
 
-       const float h_centre = (r.left() + r.right()) / 2;
-       const QPointF points[] = {
+       const QPointF left_points[] = {
+               r.topLeft(),
                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()
+               r.bottomRight(),
+               QPointF(r.left() + ArrowSize, r.bottom()),
+               QPointF(r.left(), rect.bottom()),
        };
 
-       const QPointF highlight_points[] = {
+       const QPointF right_points[] = {
+               r.topRight(),
+               r.topLeft(),
+               r.bottomLeft(),
+               QPointF(r.right() - ArrowSize, r.bottom()),
+               QPointF(r.right(), rect.bottom()),
+       };
+
+       const QPointF left_highlight_points[] = {
+               QPointF(r.left() + 1, r.top() + 1),
                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() + ArrowSize - 1, r.bottom() - 1),
+               QPointF(r.left() + 1, rect.bottom() - 1),
+       };
+
+       const QPointF right_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),
        };
 
+       const QPointF *const points = (_time > other->time()) ?
+               left_points : right_points;
+       const QPointF *const highlight_points = (_time > other->time()) ?
+               left_highlight_points : right_highlight_points;
+
+       if (selected()) {
+               p.setPen(highlight_pen());
+               p.setBrush(Qt::transparent);
+               p.drawPolygon(points, countof(left_points));
+       }
+
        p.setPen(Qt::transparent);
        p.setBrush(FillColour);
-       p.drawPolygon(points, countof(points));
+       p.drawPolygon(points, countof(left_points));
 
        p.setPen(HighlightColour);
        p.setBrush(Qt::transparent);
-       p.drawPolygon(highlight_points, countof(highlight_points));
+       p.drawPolygon(highlight_points, countof(left_highlight_points));
 
        p.setPen(LineColour);
        p.setBrush(Qt::transparent);
-       p.drawPolygon(points, countof(points));
+       p.drawPolygon(points, countof(left_points));
 
        p.setPen(TextColour);
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
@@ -112,5 +148,12 @@ void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
                Ruler::format_time(_time, prefix, 2)).size();
 }
 
+shared_ptr<Cursor> Cursor::get_other_cursor() const
+{
+       const CursorPair &cursors = _view.cursors();
+       return (cursors.first().get() == this) ?
+               cursors.second() : cursors.first();
+}
+
 } // namespace view
 } // namespace pv