Factored out TimeMarker::get_x

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index e40c393ba6e629e32724f9cba1c382bf4d48a5a3..40bb81731884c54fec36b1ed18bba5195c0879df 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -44,6 +44,11 @@ double TimeMarker::time() const
        return _time;
 }
 
        return _time;
 }
 

+float TimeMarker::get_x() const
+{
+       return (_time - _view.offset()) / _view.scale();
+}
+

 void TimeMarker::set_time(double time)
 {
        _time = time;
 void TimeMarker::set_time(double time)
 {
        _time = time;


@@ -59,7 +64,7 @@ void TimeMarker::set_time(double time)
 
 void TimeMarker::paint(QPainter &p, const QRect &rect)
 {
 
 void TimeMarker::paint(QPainter &p, const QRect &rect)
 {

-       const float x = (_time - _view.offset()) / _view.scale();
+       const float x = get_x();

        p.setPen(_colour);
        p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
 }
        p.setPen(_colour);
        p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
 }

diff --git a/pv/view/timemarker.h b/pv/view/timemarker.h
index 54b9c248529ff3e4a6c87d3fef5a1f274c626ca2..03fdd0fb2e0d55faeab68ddd1f4881cfdc8f4679 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -61,6 +61,8 @@ public:
         */
        void set_time(double time);
 
         */
        void set_time(double time);
 

+       float get_x() const;
+

        /**
         * Paints the marker to the viewport.
         * @param p The painter to draw with.
        /**
         * Paints the marker to the viewport.
         * @param p The painter to draw with.