projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add missing check for glib.
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 0376c2d40d7badbefefd632bbd0e42437248b6be..f22680b9f46f547bfbb315f43f9131140a588dc0 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-19,9
+19,9
@@
#include "cursor.hpp"
#include "cursor.hpp"
+#include "pv/util.hpp"
#include "ruler.hpp"
#include "view.hpp"
#include "ruler.hpp"
#include "view.hpp"
-#include "pv/util.hpp"
#include <QApplication>
#include <QBrush>
#include <QApplication>
#include <QBrush>
@@
-34,9
+34,8
@@
#include <cstdio>
#include <limits>
#include <cstdio>
#include <limits>
-using std::abs;
+using std::abs;
// Force usage of std::abs() instead of C's abs().
using std::shared_ptr;
using std::shared_ptr;
-using std::numeric_limits;
namespace pv {
namespace views {
namespace pv {
namespace views {
@@
-68,7
+67,7
@@
QRectF Cursor::label_rect(const QRectF &rect) const
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
- const float x =
((time_ - view_.offset())/ view_.scale()).convert_to<float>
();
+ const float x =
get_x
();
QFontMetrics m(QApplication::font());
QSize text_size = m.boundingRect(get_text()).size();
QFontMetrics m(QApplication::font());
QSize text_size = m.boundingRect(get_text()).size();