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 e4704be497500fd3323ef254ca2dc6c35086d06f..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"
 
@@ -39,7 +40,8 @@ using std::shared_ptr;
 using std::numeric_limits;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor Cursor::FillColour(52, 101, 164);
 
@@ -55,8 +57,11 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-       return util::format_time(time_, view_.tick_prefix(),
-               view_.time_unit(), 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::label_rect(const QRectF &rect) const
@@ -93,5 +98,6 @@ shared_ptr<Cursor> Cursor::get_other_cursor() const
                cursors->second() : cursors->first();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv