X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.cpp;h=b428f6027e7bf4331d5c9d4d408a3f56fe554a92;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=ec4c97d78937fb8d76ec42e8e69fa670897ce3f7;hpb=4468ee4246cd5e47845494e8b3b22a17d434ed5b;p=pulseview.git diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp index ec4c97d7..b428f602 100644 --- a/pv/views/trace/timemarker.cpp +++ b/pv/views/trace/timemarker.cpp @@ -50,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_; } @@ -65,9 +64,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time) time_ = time; if (value_widget_) { - updating_value_widget_ = true; + QSignalBlocker blocker(value_widget_); value_widget_->setValue(view_.ruler()->get_ruler_time_from_absolute_time(time)); - updating_value_widget_ = false; } view_.time_item_appearance_changed(true, true); @@ -107,6 +105,11 @@ QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const return QRectF(x - h / 2.0f, pp.top(), h, pp.height()); } +void TimeMarker::set_text(const QString &text) +{ + (void)text; +} + void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover) { if (!enabled()) @@ -192,8 +195,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent) void TimeMarker::on_value_changed(const pv::util::Timestamp& value) { - if (!updating_value_widget_) - set_time(view_.ruler()->get_absolute_time_from_ruler_time(value)); + set_time(view_.ruler()->get_absolute_time_from_ruler_time(value)); } } // namespace trace