Trace View: Move ruler time conversion from View to Ruler

[pulseview.git] / pv / views / trace / timemarker.cpp

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 0718f3cc8780704315e0e649b39c146a7a0e11bf..ec4c97d78937fb8d76ec42e8e69fa670897ce3f7 100644 (file)
--- a/pv/views/trace/timemarker.cpp
+++ b/pv/views/trace/timemarker.cpp
@@ -25,6 +25,7 @@
 #include "timemarker.hpp"
 
 #include "pv/widgets/timestampspinbox.hpp"
+#include "ruler.hpp"
 #include "view.hpp"
 
 #include <QApplication>
@@ -44,9 +45,9 @@ namespace trace {
 const int TimeMarker::ArrowSize = 4;
 
 TimeMarker::TimeMarker(
-       View &view, const QColor &colour, const pv::util::Timestamp& time) :
+       View &view, const QColor &color, const pv::util::Timestamp& time) :
        TimeItem(view),
-       colour_(colour),
+       color_(color),
        time_(time),
        value_action_(nullptr),
        value_widget_(nullptr),
@@ -65,7 +66,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 
        if (value_widget_) {
                updating_value_widget_ = true;
-               value_widget_->setValue(time);
+               value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time));
                updating_value_widget_ = false;
        }
 
@@ -80,7 +81,9 @@ float TimeMarker::get_x() const
 
 QPoint TimeMarker::drag_point(const QRect &rect) const
 {
-       return QPoint(get_x(), rect.bottom());
+       (void)rect;
+
+       return QPoint(get_x(), view_.mapFromGlobal(QCursor::pos()).y());
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
@@ -140,18 +143,18 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
        }
 
        p.setPen(Qt::transparent);
-       p.setBrush(hover ? colour_.lighter() : colour_);
+       p.setBrush(hover ? color_.lighter() : color_);
        p.drawPolygon(points, countof(points));
 
-       p.setPen(colour_.lighter());
+       p.setPen(color_.lighter());
        p.setBrush(Qt::transparent);
        p.drawPolygon(highlight_points, countof(highlight_points));
 
-       p.setPen(colour_.darker());
+       p.setPen(color_.darker());
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 
-       p.setPen(select_text_colour(colour_));
+       p.setPen(select_text_color(color_));
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
@@ -161,7 +164,7 @@ void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
                return;
 
        const float x = get_x();
-       p.setPen(colour_.darker());
+       p.setPen(color_.darker());
        p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
 }
 
@@ -177,7 +180,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
        popup->setLayout(form);
 
        value_widget_ = new pv::widgets::TimestampSpinBox(parent);
-       value_widget_->setValue(time_);
+       value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time_));
 
        connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
                this, SLOT(on_value_changed(const pv::util::Timestamp&)));
@@ -190,7 +193,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
 {
        if (!updating_value_widget_)
-               set_time(value);
+               set_time(view_.ruler()->get_absolute_time_from_ruler_time(value));
 }
 
 } // namespace trace