const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29);
const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85);
const QColor DecodeTrace::ExpandMarkerWarnColor = QColor(0xFF, 0xA5, 0x00); // QColorConstants::Svg::orange
+const QColor DecodeTrace::ExpandMarkerHiddenColor = QColor(0x69, 0x69, 0x69); // QColorConstants::Svg::dimgray
const uint8_t DecodeTrace::ExpansionAreaHeaderAlpha = 10 * 255 / 100;
const uint8_t DecodeTrace::ExpansionAreaAlpha = 5 * 255 / 100;
const int DecodeTrace::DrawPadding = 100;
const int DecodeTrace::MaxTraceUpdateRate = 1; // No more than 1 Hz
-const unsigned int DecodeTrace::AnimationDurationInTicks = 7;
-
+const int DecodeTrace::AnimationDurationInTicks = 7;
+const int DecodeTrace::HiddenRowHideDelay = 1000; // 1 second
/**
* Helper function for forceUpdate()
shared_ptr<data::SignalBase> signalbase, int index) :
Trace(signalbase),
session_(session),
- max_visible_rows_(0),
+ show_hidden_rows_(false),
delete_mapper_(this),
show_hide_mapper_(this),
row_show_hide_mapper_(this)
this, SLOT(on_animation_timer()));
animation_timer_.setInterval(1000 / 50);
+ connect(&delayed_hidden_row_hider_, SIGNAL(timeout()),
+ this, SLOT(on_hide_hidden_rows()));
+ delayed_hidden_row_hider_.setSingleShot(true);
+ delayed_hidden_row_hider_.setInterval(HiddenRowHideDelay);
+
default_marker_shape_ << QPoint(0, -ArrowSize);
default_marker_shape_ << QPoint(ArrowSize, 0);
default_marker_shape_ << QPoint(0, ArrowSize);
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<int, int> 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;
void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
{
lock_guard<mutex> lock(row_modification_mutex_);
+ unsigned int visible_rows;
#if DECODETRACE_SHOW_RENDER_TIME
render_time_.restart();
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_) {
// If the row is hidden, we don't want to fetch annotations
assert(r.decode_row);
assert(r.decode_row->decoder());
- if ((!r.decode_row->decoder()->visible()) || (!r.decode_row->visible())) {
+ if ((!r.decode_row->decoder()->visible()) ||
+ ((!r.decode_row->visible() && (!show_hidden_rows_) && (!r.expanding) && (!r.expanded) && (!r.collapsing)))) {
r.currently_visible = false;
continue;
}
r.currently_visible = !annotations.empty();
if (!r.currently_visible) {
size_t ann_count = decode_signal_->get_annotation_count(r.decode_row, current_segment_);
- r.currently_visible = (always_show_all_rows_ || r.has_hidden_classes) &&
- (ann_count > 0);
+ r.currently_visible = ((always_show_all_rows_ || r.has_hidden_classes) &&
+ (ann_count > 0)) || r.expanded;
}
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);
if (r.expand_marker_highlighted)
p.setBrush(QApplication::palette().brush(QPalette::Highlight));
+ else if (!r.decode_row->visible())
+ p.setBrush(ExpandMarkerHiddenColor);
else if (r.has_hidden_classes)
p.setBrush(ExpandMarkerWarnColor);
else
p.drawText(text_rect.translated(dx, dy), f, h);
// Draw the text
- p.setPen(QApplication::palette().color(QPalette::WindowText));
+ if (!r.decode_row->visible())
+ p.setPen(ExpandMarkerHiddenColor);
+ else
+ p.setPen(QApplication::palette().color(QPalette::WindowText));
+
p.drawText(text_rect, f, h);
y += r.height;
if (hover_row) {
int row_y = get_row_y(hover_row);
if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) &&
- (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize)))
+ (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) {
+
hover_row->expand_marker_highlighted = true;
+ show_hidden_rows_ = true;
+ delayed_hidden_row_hider_.start();
+ }
}
// Tooltip handling
const QString quote = format.contains("%q") ? "\"" : "";
format = format.remove("%q");
+ const bool has_sample_range = format.contains("%s");
+ const bool has_row_name = format.contains("%r");
+ const bool has_dec_name = format.contains("%d");
+ const bool has_class_name = format.contains("%c");
+ const bool has_first_ann_text = format.contains("%1");
+ const bool has_all_ann_text = format.contains("%a");
+
QFile file(file_name);
if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
QTextStream out_stream(&file);
for (const Annotation* ann : annotations) {
- const QString sample_range = QString("%1-%2") \
- .arg(QString::number(ann->start_sample()), QString::number(ann->end_sample()));
+ QString out_text = format;
- const QString row_name = quote + ann->row()->description() + quote;
+ if (has_sample_range) {
+ const QString sample_range = QString("%1-%2") \
+ .arg(QString::number(ann->start_sample()), QString::number(ann->end_sample()));
+ out_text = out_text.replace("%s", sample_range);
+ }
- QString all_ann_text;
- for (const QString &s : *(ann->annotations()))
- all_ann_text = all_ann_text + quote + s + quote + ",";
- all_ann_text.chop(1);
+ if (has_dec_name)
+ out_text = out_text.replace("%d",
+ quote + QString::fromUtf8(ann->row()->decoder()->name()) + quote);
- const QString first_ann_text = quote + ann->annotations()->front() + quote;
+ if (has_row_name) {
+ const QString row_name = quote + ann->row()->description() + quote;
+ out_text = out_text.replace("%r", row_name);
+ }
+
+ if (has_class_name) {
+ const QString class_name = quote + ann->ann_class_name() + quote;
+ out_text = out_text.replace("%c", class_name);
+ }
+
+ if (has_first_ann_text) {
+ const QString first_ann_text = quote + ann->annotations()->front() + quote;
+ out_text = out_text.replace("%1", first_ann_text);
+ }
+
+ if (has_all_ann_text) {
+ QString all_ann_text;
+ for (const QString &s : *(ann->annotations()))
+ all_ann_text = all_ann_text + quote + s + quote + ",";
+ all_ann_text.chop(1);
+
+ out_text = out_text.replace("%a", all_ann_text);
+ }
- QString out_text = format;
- out_text = out_text.replace("%s", sample_range);
- out_text = out_text.replace("%d",
- quote + QString::fromUtf8(ann->row()->decoder()->name()) + quote);
- out_text = out_text.replace("%r", row_name);
- out_text = out_text.replace("%1", first_ann_text);
- out_text = out_text.replace("%a", all_ann_text);
out_stream << out_text << '\n';
}
QVBoxLayout* vlayout = new QVBoxLayout();
r->container->setLayout(vlayout);
- // Add header container with checkbox for this row
+ // Add header container
vlayout->addWidget(r->header_container);
vlayout->setContentsMargins(0, 0, 0, 0);
vlayout->setSpacing(0);
+ QHBoxLayout* header_container_layout = new QHBoxLayout();
r->header_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
r->header_container->setMinimumSize(0, default_row_height_);
- r->header_container->setLayout(new QVBoxLayout());
- r->header_container->layout()->setContentsMargins(10, 2, 0, 2);
+ r->header_container->setLayout(header_container_layout);
+ r->header_container->layout()->setContentsMargins(10, 2, 10, 2);
r->header_container->setAutoFillBackground(true);
r->header_container->setPalette(header_palette);
+ // Add widgets inside the header container
QCheckBox* cb = new QCheckBox();
- r->header_container->layout()->addWidget(cb);
+ r->row_visibility_checkbox = cb;
+ header_container_layout->addWidget(cb);
cb->setText(tr("Show this row"));
cb->setChecked(r->decode_row->visible());
- cb->setEnabled(false);
-
row_show_hide_mapper_.setMapping(cb, row_id);
connect(cb, SIGNAL(stateChanged(int)),
&row_show_hide_mapper_, SLOT(map()));
+ QPushButton* btn = new QPushButton();
+ header_container_layout->addWidget(btn);
+ btn->setFlat(true);
+ btn->setStyleSheet(":hover { background-color: palette(button); color: palette(button-text); border:0; }");
+ btn->setText(tr("Show All"));
+ btn->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r));
+ connect(btn, SIGNAL(clicked(bool)), this, SLOT(on_show_all_classes()));
+
+ btn = new QPushButton();
+ header_container_layout->addWidget(btn);
+ btn->setFlat(true);
+ btn->setStyleSheet(":hover { background-color: palette(button); color: palette(button-text); border:0; }");
+ btn->setText(tr("Hide All"));
+ btn->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r));
+ connect(btn, SIGNAL(clicked(bool)), this, SLOT(on_hide_all_classes()));
+
+ header_container_layout->addStretch(); // To left-align the header widgets
+
// Add selector container
vlayout->addWidget(r->selector_container);
r->selector_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
cb->setIcon(pixmap);
r->selector_container->layout()->addWidget(cb);
+ r->selectors.push_back(cb);
cb->setProperty("ann_class_ptr", QVariant::fromValue((void*)ann_class));
cb->setProperty("decode_trace_row_ptr", QVariant::fromValue((void*)r));
void DecodeTrace::update_rows()
{
+ if (!owner_)
+ return;
+
lock_guard<mutex> lock(row_modification_mutex_);
for (DecodeTraceRow& r : 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 {
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;
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)
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()
{
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()
void DecodeTrace::on_decode_reset()
{
- max_visible_rows_ = 0;
update_rows();
if (owner_)
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();
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);
}
if (row_id >= (int)rows_.size())
return;
- set_row_collapsed(&rows_[row_id]);
rows_[row_id].decode_row->set_visible(!rows_[row_id].decode_row->visible());
- // Force re-calculation of the trace height, see paint_mid()
- max_visible_rows_ = 0;
+ if (!rows_[row_id].decode_row->visible())
+ set_row_collapsed(&rows_[row_id]);
+
owner_->extents_changed(false, true);
owner_->row_item_appearance_changed(false, true);
}
owner_->row_item_appearance_changed(false, true);
}
+void DecodeTrace::on_show_all_classes()
+{
+ void* row_ptr = QObject::sender()->property("decode_trace_row_ptr").value<void*>();
+ assert(row_ptr);
+ DecodeTraceRow* row = (DecodeTraceRow*)row_ptr;
+
+ for (QCheckBox* cb : row->selectors)
+ cb->setChecked(true);
+
+ row->has_hidden_classes = false;
+
+ owner_->row_item_appearance_changed(false, true);
+}
+
+void DecodeTrace::on_hide_all_classes()
+{
+ void* row_ptr = QObject::sender()->property("decode_trace_row_ptr").value<void*>();
+ assert(row_ptr);
+ DecodeTraceRow* row = (DecodeTraceRow*)row_ptr;
+
+ for (QCheckBox* cb : row->selectors)
+ cb->setChecked(false);
+
+ row->has_hidden_classes = true;
+
+ owner_->row_item_appearance_changed(false, true);
+}
+
void DecodeTrace::on_row_container_resized(QWidget* sender)
{
sender->update();
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
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
owner_->row_item_appearance_changed(false, true);
}
+void DecodeTrace::on_hide_hidden_rows()
+{
+ // Make all hidden traces invisible again unless the user is hovering over a row name
+ bool any_highlighted = false;
+
+ for (DecodeTraceRow& r : rows_)
+ if (r.expand_marker_highlighted)
+ any_highlighted = true;
+
+ if (!any_highlighted) {
+ show_hidden_rows_ = false;
+
+ owner_->extents_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
+ }
+}
+
} // namespace trace
} // namespace views
} // namespace pv
projects / pulseview.git / blobdiff