X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=98b7289f11f0babd8c1bf73b33959d89ba0f1031;hb=1ef49ddd04f44a4369403fbab19ed235483e2975;hp=6eb575e3175cc5128c6af17fbef0279a416a041f;hpb=58864c5c5dffac4254f199356aaeb5eabd608630;p=pulseview.git diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 6eb575e3..98b7289f 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.cpp @@ -20,8 +20,8 @@ #include "cursor.h" -#include "ruler.h" #include "view.h" +#include "pv/util.h" #include #include @@ -29,11 +29,12 @@ #include #include -#include +#include +#include #include -using namespace boost; +using std::shared_ptr; namespace pv { namespace view { @@ -47,7 +48,7 @@ const int Cursor::Offset = 1; const int Cursor::ArrowSize = 4; -Cursor::Cursor(const View &view, double time) : +Cursor::Cursor(View &view, double time) : TimeMarker(view, LineColour, time) { } @@ -139,13 +140,13 @@ void Cursor::paint_label(QPainter &p, const QRect &rect, 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, - Ruler::format_time(_time, prefix, 2)).size(); + pv::util::format_time(_time, prefix, 2)).size(); } shared_ptr Cursor::get_other_cursor() const