X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=8c136a18189285e3a965af58e49ad0642f002b87;hp=5b21bfd84b7012025abe59cdca5f5877491be552;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=be7170664b80552fdfb38da1c214c271cbf116aa;ds=sidebyside

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 5b21bfd8..8c136a18 100644
--- 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>
@@ -41,22 +42,23 @@ namespace view {
 
 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;
 
@@ -71,12 +73,12 @@ void TimeMarker::set_time(double 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
 {
-	return QPoint(get_x(), rect.right());
+	return QPoint(get_x(), rect.bottom());
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
@@ -88,17 +90,24 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
 	const QSizeF label_size(text_size + LabelPadding * 2);
 	const float top = rect.height() - label_size.height() -
 		TimeMarker::ArrowSize - 0.5f;
-	const float x = (time_ - view_.offset()) / view_.scale();
+	const float x = get_x();
 
 	return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
 }
 
+QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+{
+	const float x = get_x();
+	const float h = QFontMetrics(QApplication::font()).height();
+	return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+}
+
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	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[] = {
@@ -159,25 +168,24 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	Popup *const popup = new Popup(parent);
+	popup->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Bottom);
+
 	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);