ViewItem: Make hit_box_rect take ViewItemPaintParams

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index f1424627d9aa27dae374175a5d11b4bf000e5f23..b5662e4b6ba32e3ec6b90945f11799cf68cc59ce 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -25,6 +25,7 @@
 #include "timemarker.hpp"
 
 #include "view.hpp"
+#include "pv/widgets/timestampspinbox.hpp"
 
 #include <QApplication>
 #include <QFormLayout>
@@ -63,7 +64,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 
        if (value_widget_) {
                updating_value_widget_ = true;
-               value_widget_->setValue(time.convert_to<double>());
+               value_widget_->setValue(time);
                updating_value_widget_ = false;
        }
 
@@ -94,11 +95,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)
@@ -173,22 +174,18 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
        QFormLayout *const form = new QFormLayout(popup);
        popup->setLayout(form);
 
-       value_widget_ = new QDoubleSpinBox(parent);
-       value_widget_->setDecimals(9);
-       value_widget_->setSuffix("s");
-       value_widget_->setSingleStep(1e-6);
-       value_widget_->setRange(-1.0e9, 1.0e9);
-       value_widget_->setValue(time_.convert_to<double>());
+       value_widget_ = new pv::widgets::TimestampSpinBox(parent);
+       value_widget_->setValue(time_);
 
-       connect(value_widget_, SIGNAL(valueChanged(double)),
-               this, SLOT(on_value_changed(double)));
+       connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
+               this, SLOT(on_value_changed(const pv::util::Timestamp&)));
 
        form->addRow(tr("Time"), value_widget_);
 
        return popup;
 }
 
-void TimeMarker::on_value_changed(double value)
+void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
 {
        if (!updating_value_widget_)
                set_time(value);