X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=e40c393ba6e629e32724f9cba1c382bf4d48a5a3;hp=8474791d485a31f888b1b68aa47b5b98617425c8;hb=317008bac93a797279be2265f40626cc772da353;hpb=fda416f178ec326315bf5172d902546498a3cf0d

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 8474791d..e40c393b 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -24,22 +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) :
-	QObject(),
-	_view(s._view),
-	_colour(s._colour),
-	_time(s._time)
+	_time(time),
+	_value_action(NULL),
+	_value_widget(NULL),
+	_updating_value_widget(false)
 {
 }
 
@@ -51,6 +47,13 @@ double TimeMarker::time() const
 void TimeMarker::set_time(double time)
 {
 	_time = time;
+
+	if (_value_widget) {
+		_updating_value_widget = true;
+		_value_widget->setValue(time);
+		_updating_value_widget = false;
+	}
+
 	time_changed();
 }
 
@@ -61,5 +64,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