Add a spin box widget for timestamp values

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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index e4ef3c0e1cb5edff4a2765484ca93a3697431369..8c136a18189285e3a965af58e49ad0642f002b87 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -25,6 +25,7 @@
 #include "timemarker.hpp"
 
 #include "view.hpp"
 #include "timemarker.hpp"
 
 #include "view.hpp"

+#include "pv/widgets/timestampspinbox.hpp"

 
 #include <QApplication>
 #include <QFormLayout>
 
 #include <QApplication>
 #include <QFormLayout>


@@ -41,7 +42,8 @@ namespace view {
 
 const int TimeMarker::ArrowSize = 4;
 
 
 const int TimeMarker::ArrowSize = 4;
 

-TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
+TimeMarker::TimeMarker(
+       View &view, const QColor &colour, const pv::util::Timestamp& time) :

        TimeItem(view),
        colour_(colour),
        time_(time),
        TimeItem(view),
        colour_(colour),
        time_(time),


@@ -51,12 +53,12 @@ TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
 {
 }
 
 {
 }
 

-double TimeMarker::time() const
+const pv::util::Timestamp& TimeMarker::time() const

 {
        return time_;
 }
 
 {
        return time_;
 }
 

-void TimeMarker::set_time(double time)
+void TimeMarker::set_time(const pv::util::Timestamp& time)

 {
        time_ = time;
 
 {
        time_ = time;
 


@@ -71,7 +73,7 @@ void TimeMarker::set_time(double time)
 
 float TimeMarker::get_x() const
 {
 
 float TimeMarker::get_x() const
 {

-       return (time_ - view_.offset()) / view_.scale();
+       return ((time_ - view_.offset()) / view_.scale()).convert_to<float>();

 }
 
 QPoint TimeMarker::point(const QRect &rect) const
 }
 
 QPoint TimeMarker::point(const QRect &rect) const


@@ -105,7 +107,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();
+       const qreal x = ((time_ - view_.offset()) / view_.scale()).convert_to<qreal>();

        const QRectF r(label_rect(rect));
 
        const QPointF points[] = {
        const QRectF r(label_rect(rect));
 
        const QPointF points[] = {


@@ -172,22 +174,18 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
        QFormLayout *const form = new QFormLayout(popup);
        popup->setLayout(form);
 
        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_ = new pv::widgets::TimestampSpinBox(parent);

        value_widget_->setValue(time_);
 
        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;
 }
 
 
        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);
 {
        if (!updating_value_widget_)
                set_time(value);