#include "timemarker.hpp"
#include "view.hpp"
+#include "pv/widgets/timestampspinbox.hpp"
#include <QApplication>
#include <QFormLayout>
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),
- value_action_(NULL),
- value_widget_(NULL),
+ value_action_(nullptr),
+ value_widget_(nullptr),
updating_value_widget_(false)
{
}
-double TimeMarker::time() const
+const pv::util::Timestamp& TimeMarker::time() const
{
return time_;
}
-void TimeMarker::set_time(double time)
+void TimeMarker::set_time(const pv::util::Timestamp& time)
{
time_ = time;
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
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[] = {
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_);
- 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);