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 3ae5f58a82c9811bc9afef528f1d3025684eb1be..512b5fa9791425a6a84f8de5a12bab1f61d6ab2f 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,44 +18,79 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <QApplication>
 #include <QBrush>
 #include <QPainter>
+#include <QPointF>
 #include <QRect>
 #include <QRectF>
 
+#include <cassert>
+#include <cstdio>
+#include <limits>
+
+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::Size = 12;
-const int Cursor::Offset = 1;
+Cursor::Cursor(View &view, double time) :
+       TimeMarker(view, FillColour, time)
+{
+}
+
+bool Cursor::enabled() const
+{
+       return view_.cursors_shown();
+}
 
-Cursor::Cursor(const View &view, double time) :
-       TimeMarker(view, LineColour, time)
+QString Cursor::get_text() const
 {
+       return pv::util::format_time(time_, view_.tick_prefix(), 2);
 }
 
-void Cursor::paint_label(QPainter &p, const QRect &rect)
+QRectF Cursor::label_rect(const QRectF &rect) const
 {
-       const float x = (_time - _view.offset()) / _view.scale();
-       const QRectF r(x - Size/2, rect.height() - Size - Offset,
-               Size, Size);
+       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();
 
-       p.setPen(LineColour);
-       p.setBrush(QBrush(FillColour));
-       p.drawEllipse(r);
+       const QSizeF label_size(
+               text_size.width() + LabelPadding.width() * 2,
+               text_size.height() + LabelPadding.height() * 2);
+       const float top = rect.height() - label_size.height() -
+               TimeMarker::ArrowSize - 0.5f;
+       const float height = label_size.height();
 
-       p.setPen(HighlightColour);
-       p.setBrush(QBrush());
-       p.drawEllipse(r.adjusted(1, 1, -1, -1));
+       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);
+}
+
+shared_ptr<Cursor> Cursor::get_other_cursor() const
+{
+       const shared_ptr<CursorPair> cursors(view_.cursors());
+       assert(cursors);
+       return (cursors->first().get() == this) ?
+               cursors->second() : cursors->first();
 }
 
 } // namespace view