X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftimemarker.cpp;h=853f7c02675e0b594606e96eff8574734fcb2fff;hb=00c2ad4c9530f3f8395b5ae6737965d7e87ea023;hp=8c136a18189285e3a965af58e49ad0642f002b87;hpb=806d3e1eb3d60e93ff95d23e79588a0486730967;p=pulseview.git
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 8c136a1..853f7c0 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -14,22 +14,22 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
+#include
#include
#include "timemarker.hpp"
-#include "view.hpp"
#include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
#include
-#include
#include
+#include
#include
#include
@@ -38,7 +38,8 @@ using std::max;
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
@@ -73,7 +74,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
- return ((time_ - view_.offset()) / view_.scale()).convert_to();
+ // Use roundf() from cmath, std::roundf() causes Android issues (see #945).
+ return roundf(((time_ - view_.offset()) / view_.scale()).convert_to()) + 0.5f;
}
QPoint TimeMarker::point(const QRect &rect) const
@@ -95,11 +97,11 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
-QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
{
const float x = get_x();
const float h = QFontMetrics(QApplication::font()).height();
- return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+ return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -107,7 +109,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
- const qreal x = ((time_ - view_.offset()) / view_.scale()).convert_to();
+ const qreal x = get_x();
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());
}
-void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
if (!enabled())
return;
@@ -191,5 +193,6 @@ void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv