projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #958 by using new method that auto-converts analog samples
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index eaa03b942294e62c4500f7b59bdbccb1a4b3ef8d..853f7c02675e0b594606e96eff8574734fcb2fff 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-74,7
+74,8
@@
void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
float TimeMarker::get_x() const
{
- return std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
+ // Use roundf() from cmath, std::roundf() causes Android issues (see #945).
+ return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
}
QPoint TimeMarker::point(const QRect &rect) const
}
QPoint TimeMarker::point(const QRect &rect) const