Put the time format function into a separate file.

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index ca22eefdf1f65d44c145f84c0649733b6b9e3e84..95134b775a1d3daaeaa13f3ff3ce0f51fe245441 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -20,8 +20,8 @@
 
 #include "cursor.h"
 
 
 #include "cursor.h"
 

-#include "ruler.h"

 #include "view.h"
 #include "view.h"

+#include "pv/util.h"

 
 #include <QBrush>
 #include <QPainter>
 
 #include <QBrush>
 #include <QPainter>


@@ -139,13 +139,13 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 
        p.setPen(TextColour);
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
 
        p.setPen(TextColour);
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,

-               Ruler::format_time(_time, prefix, 2));
+               pv::util::format_time(_time, prefix, 2));

 }
 
 void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 {
        _text_size = p.boundingRect(QRectF(), 0,
 }
 
 void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 {
        _text_size = p.boundingRect(QRectF(), 0,

-               Ruler::format_time(_time, prefix, 2)).size();
+               pv::util::format_time(_time, prefix, 2)).size();

 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const