X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.cpp;h=b428f6027e7bf4331d5c9d4d408a3f56fe554a92;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=487496d9fd102d1c8c3f72295b0669259fbdf702;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 487496d9..b428f602 100644
--- 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,17 +45,16 @@ 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),
-	updating_value_widget_(false)
+	value_widget_(nullptr)
 {
 }
 
-const pv::util::Timestamp& TimeMarker::time() const
+const pv::util::Timestamp TimeMarker::time() const
 {
 	return time_;
 }
@@ -64,9 +64,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 	time_ = time;
 
 	if (value_widget_) {
-		updating_value_widget_ = true;
-		value_widget_->setValue(time);
-		updating_value_widget_ = false;
+		QSignalBlocker blocker(value_widget_);
+		value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time));
 	}
 
 	view_.time_item_appearance_changed(true, true);
@@ -78,9 +77,11 @@ float TimeMarker::get_x() const
 	return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
 }
 
-QPoint TimeMarker::point(const QRect &rect) 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
@@ -104,6 +105,11 @@ QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
 	return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
 }
 
+void TimeMarker::set_text(const QString &text)
+{
+	(void)text;
+}
+
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	if (!enabled())
@@ -140,18 +146,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 +167,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()));
 }
 
@@ -171,13 +177,13 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 	Popup *const popup = new Popup(parent);
 	popup->set_position(parent->mapToGlobal(
-		point(parent->rect())), Popup::Bottom);
+		drag_point(parent->rect())), Popup::Bottom);
 
 	QFormLayout *const form = new QFormLayout(popup);
 	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&)));
@@ -189,8 +195,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