Don't attempt to set the value if TimeMarker::_value_widget has not been created

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 75ef4ea63e69b223616ffb072207dfba3b4ed224..e40c393ba6e629e32724f9cba1c382bf4d48a5a3 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -24,14 +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)
+       _time(time),
+       _value_action(NULL),
+       _value_widget(NULL),
+       _updating_value_widget(false)
 {
 }
 
@@ -43,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();
 }
 
@@ -53,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