Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 836d0e93d758fd911e371ef5383eda291ffa41c6..4f2ef126a83fa357e88f5b6d69872fd0802cc29e 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -20,6 +20,7 @@
 
 #include "cursor.hpp"
 
+#include "ruler.hpp"
 #include "view.hpp"
 #include "pv/util.hpp"
 
@@ -32,11 +33,15 @@
 
 #include <cassert>
 #include <cstdio>
+#include <limits>
 
+using std::abs;
 using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor Cursor::FillColour(52, 101, 164);
 
@@ -52,31 +57,37 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-       return pv::util::format_time(time_, view_.tick_prefix(), 2);
+       const shared_ptr<Cursor> other = get_other_cursor();
+       const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+       return Ruler::format_time_with_distance(
+               diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
 }
 
-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();
+       const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
 
        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() -
-               TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+               TimeMarker::ArrowSize - 0.5f;
        const float height = label_size.height();
 
-       if (time_ > other->time())
+       const pv::util::Timestamp& other_time = other->time();
+
+       if (time_ > other_time ||
+               (abs(time_ - other_time).is_zero() && this > other.get()))
                return QRectF(x, top, label_size.width(), height);
        else
-               return QRectF(x - label_size.width(), top,
-                       label_size.width(), height);
+               return QRectF(x - label_size.width(), top, label_size.width(), height);
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const
@@ -87,5 +98,6 @@ shared_ptr<Cursor> Cursor::get_other_cursor() const
                cursors->second() : cursors->first();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv