projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #940 by updating the div spin boxes when needed
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 3014b4a65a8e6d67adbfaa12d685766d4035302f..853f7c02675e0b594606e96eff8574734fcb2fff 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-18,17
+18,18
@@
*/
#include <algorithm>
*/
#include <algorithm>
+#include <cmath>
#include <extdef.h>
#include "timemarker.hpp"
#include <extdef.h>
#include "timemarker.hpp"
-#include "view.hpp"
#include "pv/widgets/timestampspinbox.hpp"
#include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
#include <QApplication>
#include <QApplication>
-#include <QFormLayout>
#include <QFontMetrics>
#include <QFontMetrics>
+#include <QFormLayout>
#include <QPainter>
#include <pv/widgets/popup.hpp>
#include <QPainter>
#include <pv/widgets/popup.hpp>
@@
-73,7
+74,8
@@
void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
float TimeMarker::get_x() const
{
- return ((time_ - view_.offset()) / view_.scale()).convert_to<float>();
+ // 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
@@
-107,7
+109,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
if (!enabled())
return;
- const qreal x =
((time_ - view_.offset()) / view_.scale()).convert_to<qreal>
();
+ const qreal x =
get_x
();
const QRectF r(label_rect(rect));
const QPointF points[] = {
const QRectF r(label_rect(rect));
const QPointF points[] = {
@@
-153,7
+155,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
-void TimeMarker::paint_fore(QPainter &p,
const
ViewItemPaintParams &pp)
+void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
if (!enabled())
return;
{
if (!enabled())
return;