X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.cpp;h=0f390f528004858f3a835fcb781bc5d1ad332b18;hb=HEAD;hp=266007a57053c220f59a87fe80eb630438a413c0;hpb=eeceee9955e7db4ac777d49d1b7a766069476b08;p=pulseview.git

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 266007a5..0f390f52 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>
@@ -49,12 +50,11 @@ TimeMarker::TimeMarker(
 	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);
@@ -89,7 +88,7 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
 	QFontMetrics m(QApplication::font());
 	const QSizeF text_size(
-		max(m.boundingRect(get_text()).size().width(), ArrowSize),
+		max(m.boundingRect(get_display_text()).size().width(), ArrowSize),
 		m.height());
 	const QSizeF label_size(text_size + LabelPadding * 2);
 	const float top = rect.height() - label_size.height() -
@@ -106,6 +105,16 @@ QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
 	return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
 }
 
+QString TimeMarker::get_display_text() const
+{
+	return get_text();
+}
+
+void TimeMarker::set_text(const QString &text)
+{
+	(void)text;
+}
+
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	if (!enabled())
@@ -154,7 +163,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(select_text_color(color_));
-	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
+	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_display_text());
 }
 
 void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
@@ -175,11 +184,13 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	popup->set_position(parent->mapToGlobal(
 		drag_point(parent->rect())), Popup::Bottom);
 
+	connect(popup, SIGNAL(closed()), this, SLOT(on_popup_closed()));
+
 	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,10 +200,16 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	return popup;
 }
 
+void TimeMarker::on_popup_closed()
+{
+	GlobalSettings settings;
+	if (!settings.value(GlobalSettings::Key_View_KeepRulerItemSelected).toBool())
+		select(false);
+}
+
 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