X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=f22680b9f46f547bfbb315f43f9131140a588dc0;hb=64a21e782d6c9081f13f8398e6408c13648d1d14;hp=0376c2d40d7badbefefd632bbd0e42437248b6be;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 0376c2d4..f22680b9 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.cpp @@ -19,9 +19,9 @@ #include "cursor.hpp" +#include "pv/util.hpp" #include "ruler.hpp" #include "view.hpp" -#include "pv/util.hpp" #include #include @@ -34,9 +34,8 @@ #include #include -using std::abs; +using std::abs; // Force usage of std::abs() instead of C's abs(). using std::shared_ptr; -using std::numeric_limits; namespace pv { namespace views { @@ -68,7 +67,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const const shared_ptr other(get_other_cursor()); assert(other); - const float x = ((time_ - view_.offset())/ view_.scale()).convert_to(); + const float x = get_x(); QFontMetrics m(QApplication::font()); QSize text_size = m.boundingRect(get_text()).size();