X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=1cc89feb67ae46af816a036b26d97e55d9a3ec87;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=8ca8d580c8b4a4bb4fadf89e84421491fd567056;hpb=440bdf504a05efe589e8954ad28be62ba2c2d325;p=pulseview.git diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 8ca8d580..1cc89feb 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -150,7 +150,6 @@ DecodeTrace::DecodeTrace(pv::Session &session, shared_ptr signalbase, int index) : Trace(signalbase), session_(session), - max_visible_rows_(0), show_hidden_rows_(false), delete_mapper_(this), show_hide_mapper_(this), @@ -242,10 +241,21 @@ shared_ptr DecodeTrace::base() const return base_; } +void DecodeTrace::set_owner(TraceTreeItemOwner *owner) +{ + Trace::set_owner(owner); + + // The owner is set in trace::View::signals_changed(), which is a slot. + // So after this trace was added to the view, we won't have an owner + // that we need to initialize in update_rows(). Once we do, we call it + // from on_decode_reset(). + on_decode_reset(); +} + pair DecodeTrace::v_extents() const { // Make an empty decode trace appear symmetrical - if (max_visible_rows_ == 0) + if (visible_rows_ == 0) return make_pair(-default_row_height_, default_row_height_); unsigned int height = 0; @@ -265,6 +275,7 @@ void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp) void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) { lock_guard lock(row_modification_mutex_); + unsigned int visible_rows; #if DECODETRACE_SHOW_RENDER_TIME render_time_.restart(); @@ -281,7 +292,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) sample_range.second = min((int64_t)sample_range.second, decode_signal_->get_decoded_sample_count(current_segment_, false)); - visible_rows_ = 0; + visible_rows = 0; int y = get_visual_y(); for (DecodeTraceRow& r : rows_) { @@ -311,14 +322,14 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) if (r.currently_visible) { draw_annotations(annotations, p, pp, y, r); y += r.height; - visible_rows_++; + visible_rows++; } } draw_unresolved_period(p, pp.left(), pp.right()); - if (visible_rows_ > max_visible_rows_) { - max_visible_rows_ = visible_rows_; + if (visible_rows != visible_rows_) { + visible_rows_ = visible_rows; // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -1316,6 +1327,7 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) // Add widgets inside the header container QCheckBox* cb = new QCheckBox(); + r->row_visibility_checkbox = cb; header_container_layout->addWidget(cb); cb->setText(tr("Show this row")); cb->setChecked(r->decode_row->visible()); @@ -1377,6 +1389,9 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id) void DecodeTrace::update_rows() { + if (!owner_) + return; + lock_guard lock(row_modification_mutex_); for (DecodeTraceRow& r : rows_) @@ -1426,6 +1441,10 @@ void DecodeTrace::update_rows() row_id++; } + // If there's only one row, it must not be hidden or else it can't be un-hidden + if (row_id == 1) + rows_.front().row_visibility_checkbox->setEnabled(false); + // Remove any rows that no longer exist, obeying that iterators are invalidated bool any_exists; do { @@ -1433,6 +1452,8 @@ void DecodeTrace::update_rows() for (unsigned int i = 0; i < rows_.size(); i++) if (!rows_[i].exists) { + delete rows_[i].row_visibility_checkbox; + for (QCheckBox* cb : rows_[i].selectors) delete cb; @@ -1460,8 +1481,6 @@ void DecodeTrace::set_row_expanded(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) @@ -1474,8 +1493,6 @@ void DecodeTrace::set_row_collapsed(DecodeTraceRow* r) r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(), r->height - 2 * default_row_height_); - - max_visible_rows_ = 0; } void DecodeTrace::update_expanded_rows() @@ -1505,10 +1522,8 @@ void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value) { Trace::on_setting_changed(key, value); - if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) { - max_visible_rows_ = 0; + if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) always_show_all_rows_ = value.toBool(); - } } void DecodeTrace::on_new_annotations() @@ -1525,7 +1540,6 @@ void DecodeTrace::on_delayed_trace_update() void DecodeTrace::on_decode_reset() { - max_visible_rows_ = 0; update_rows(); if (owner_) @@ -1597,8 +1611,6 @@ void DecodeTrace::on_delete_decoder(int index) decode_signal_->remove_decoder(index); update_rows(); - // Force re-calculation of the trace height - max_visible_rows_ = 0; owner_->extents_changed(false, true); create_popup_form(); @@ -1611,11 +1623,8 @@ void DecodeTrace::on_show_hide_decoder(int index) assert(index < (int)decoder_forms_.size()); decoder_forms_[index]->set_decoder_visible(state); - if (!state) { - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; + if (!state) owner_->extents_changed(false, true); - } owner_->row_item_appearance_changed(false, true); } @@ -1630,8 +1639,6 @@ void DecodeTrace::on_show_hide_row(int row_id) if (!rows_[row_id].decode_row->visible()) set_row_collapsed(&rows_[row_id]); - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); } @@ -1813,7 +1820,7 @@ void DecodeTrace::on_animation_timer() if (r.expanding) { if (r.height < r.expanded_height) { r.anim_height += height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = min((int)r.anim_height, (int)r.expanded_height); r.anim_shape += ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1823,7 +1830,7 @@ void DecodeTrace::on_animation_timer() if (r.collapsing) { if (r.height > default_row_height_) { r.anim_height -= height_delta / (float)AnimationDurationInTicks; - r.height = r.anim_height; + r.height = max((int)r.anim_height, (int)0); r.anim_shape -= ArrowSize / (float)AnimationDurationInTicks; animation_finished = false; } else @@ -1858,8 +1865,6 @@ void DecodeTrace::on_hide_hidden_rows() if (!any_highlighted) { show_hidden_rows_ = false; - // Force re-calculation of the trace height, see paint_mid() - max_visible_rows_ = 0; owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); }