X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=e40c393ba6e629e32724f9cba1c382bf4d48a5a3;hp=03749689cb44aa602f5ce12e68affb55c821d5d9;hb=317008bac93a797279be2265f40626cc772da353;hpb=1e256e16a17271fab3c9c57de3558b3b1c8184f4 diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index 03749689..e40c393b 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -33,19 +33,10 @@ TimeMarker::TimeMarker(View &view, const QColor &colour, double time) : _view(view), _colour(colour), _time(time), - _value_action(&view), - _value_widget(&view), + _value_action(NULL), + _value_widget(NULL), _updating_value_widget(false) { - _value_action.setDefaultWidget(&_value_widget); - - _value_widget.setValue(time); - _value_widget.setDecimals(6); - _value_widget.setSuffix("s"); - _value_widget.setSingleStep(1e-6); - - connect(&_value_widget, SIGNAL(valueChanged(double)), - this, SLOT(on_value_changed(double))); } double TimeMarker::time() const @@ -56,9 +47,13 @@ double TimeMarker::time() const void TimeMarker::set_time(double time) { _time = time; - _updating_value_widget = true; - _value_widget.setValue(time); - _updating_value_widget = false; + + if (_value_widget) { + _updating_value_widget = true; + _value_widget->setValue(time); + _updating_value_widget = false; + } + time_changed(); } @@ -69,13 +64,6 @@ void TimeMarker::paint(QPainter &p, const QRect &rect) p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom())); } -const list TimeMarker::get_context_bar_actions() -{ - list actions; - actions.push_back(&_value_action); - return actions; -} - void TimeMarker::on_value_changed(double value) { if (!_updating_value_widget) {