X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftimemarker.cpp;h=5fd75dd8db91c4104a91b0a70b044f86374daedb;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hp=ec0ab9a4fe4f59857e47e0fcc7443747e3039a1c;hpb=2a2512b21581ea346fea7d96bd3deeb37f1cfed4;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index ec0ab9a4..5fd75dd8 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -24,21 +24,18 @@
 
 #include <QPainter>
 
+using namespace std;
+
 namespace pv {
 namespace view {
 
-TimeMarker::TimeMarker(const View &view, const QColor &colour,
-	double time) :
+TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
 	_view(view),
 	_colour(colour),
-	_time(time)
-{
-}
-
-TimeMarker::TimeMarker(const TimeMarker &s) :
-	_view(s._view),
-	_colour(s._colour),
-	_time(s._time)
+	_time(time),
+	_value_action(NULL),
+	_value_widget(NULL),
+	_updating_value_widget(false)
 {
 }
 
@@ -50,6 +47,9 @@ double TimeMarker::time() const
 void TimeMarker::set_time(double time)
 {
 	_time = time;
+	_updating_value_widget = true;
+	_value_widget->setValue(time);
+	_updating_value_widget = false;
 	time_changed();
 }
 
@@ -60,5 +60,13 @@ void TimeMarker::paint(QPainter &p, const QRect &rect)
 	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
 }
 
+void TimeMarker::on_value_changed(double value)
+{
+	if (!_updating_value_widget) {
+		_time = value;
+		time_changed();
+	}
+}
+
 } // namespace view
 } // namespace pv