Cursor: Don't draw cursors over each other when they have equal time

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 0cc63142054c4598def0c8cad58d5a4d32a5d21c..512b5fa9791425a6a84f8de5a12bab1f61d6ab2f 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <QApplication>
 #include <QBrush>
 #include <QPainter>
 #include <QPointF>
@@ -31,129 +32,65 @@
 
 #include <cassert>
 #include <cstdio>
+#include <limits>
 
-#include <extdef.h>
-
+using std::abs;
 using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
 namespace view {
 
-const QColor Cursor::LineColour(32, 74, 135);
 const QColor Cursor::FillColour(52, 101, 164);
-const QColor Cursor::HighlightColour(83, 130, 186);
-const QColor Cursor::TextColour(Qt::white);
 
-const int Cursor::Offset = 1;
+Cursor::Cursor(View &view, double time) :
+       TimeMarker(view, FillColour, time)
+{
+}
 
-const int Cursor::ArrowSize = 4;
+bool Cursor::enabled() const
+{
+       return view_.cursors_shown();
+}
 
-Cursor::Cursor(View &view, double time) :
-       TimeMarker(view, LineColour, time)
+QString Cursor::get_text() const
 {
+       return pv::util::format_time(time_, view_.tick_prefix(), 2);
 }
 
-QRectF Cursor::get_label_rect(const QRect &rect) const
+QRectF Cursor::label_rect(const QRectF &rect) const
 {
        const shared_ptr<Cursor> other(get_other_cursor());
        assert(other);
 
        const float x = (time_ - view_.offset()) / view_.scale();
 
+       QFontMetrics m(QApplication::font());
+       QSize text_size = m.boundingRect(get_text()).size();
+
        const QSizeF label_size(
-               text_size_.width() + View::LabelPadding.width() * 2,
-               text_size_.height() + View::LabelPadding.height() * 2);
+               text_size.width() + LabelPadding.width() * 2,
+               text_size.height() + LabelPadding.height() * 2);
        const float top = rect.height() - label_size.height() -
-               Cursor::Offset - Cursor::ArrowSize - 0.5f;
+               TimeMarker::ArrowSize - 0.5f;
        const float height = label_size.height();
 
-       if (time_ > other->time())
+       const double other_time = other->time();
+       if (time_ > other_time ||
+               (abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
+               this > other.get()))
                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 QPointF left_points[] = {
-               r.topLeft(),
-               r.topRight(),
-               r.bottomRight(),
-               QPointF(r.left() + ArrowSize, r.bottom()),
-               QPointF(r.left(), rect.bottom()),
-       };
-
-       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(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(left_points));
-
-       p.setPen(HighlightColour);
-       p.setBrush(Qt::transparent);
-       p.drawPolygon(highlight_points, countof(left_highlight_points));
-
-       p.setPen(LineColour);
-       p.setBrush(Qt::transparent);
-       p.drawPolygon(points, countof(left_points));
-
-       p.setPen(TextColour);
-       p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-               pv::util::format_time(time_, prefix, 2));
-}
-
-void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
-{
-       text_size_ = p.boundingRect(QRectF(), 0,
-               pv::util::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();
+       const shared_ptr<CursorPair> cursors(view_.cursors());
+       assert(cursors);
+       return (cursors->first().get() == this) ?
+               cursors->second() : cursors->first();
 }
 
 } // namespace view