#include <pv/data/logicsegment.hpp>
#include <pv/widgets/decodergroupbox.hpp>
#include <pv/widgets/decodermenu.hpp>
+#include <pv/widgets/flowlayout.hpp>
using std::abs;
using std::find_if;
using std::max;
using std::min;
using std::numeric_limits;
-using std::out_of_range;
using std::pair;
using std::shared_ptr;
using std::tie;
namespace views {
namespace trace {
-#define DECODETRACE_COLOR_SATURATION (180) /* 0-255 */
-#define DECODETRACE_COLOR_VALUE (170) /* 0-255 */
-
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()
+ */
+void invalidateLayout(QLayout* layout)
+{
+ // Recompute the given layout and all its child layouts recursively
+ for (int i = 0; i < layout->count(); i++) {
+ QLayoutItem *item = layout->itemAt(i);
+
+ if (item->layout())
+ invalidateLayout(item->layout());
+ else
+ item->invalidate();
+ }
+
+ layout->invalidate();
+ layout->activate();
+}
+
+void forceUpdate(QWidget* widget)
+{
+ // Update all child widgets recursively
+ for (QObject* child : widget->children())
+ if (child->isWidgetType())
+ forceUpdate((QWidget*)child);
+
+ // Invalidate the layout of the widget itself
+ if (widget->layout())
+ invalidateLayout(widget->layout());
+}
+
+
+ContainerWidget::ContainerWidget(QWidget *parent) :
+ QWidget(parent)
+{
+}
+
+void ContainerWidget::resizeEvent(QResizeEvent* event)
+{
+ QWidget::resizeEvent(event);
+
+ widgetResized(this);
+}
+
DecodeTrace::DecodeTrace(pv::Session &session,
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)
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
- min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
+ // e.g. two hex characters
+ min_useful_label_width_ = util::text_width(m, "XX");
default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4;
annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4;
// Note: The offset equals the color of the first annotation
QColor color;
const int h = (120 + 160 * index) % 360;
- const int s = DECODETRACE_COLOR_SATURATION;
- const int v = DECODETRACE_COLOR_VALUE;
+ const int s = DECODE_COLOR_SATURATION;
+ const int v = DECODE_COLOR_VALUE;
color.setHsv(h, s, v);
base_->set_color(color);
+ connect(decode_signal_.get(), SIGNAL(color_changed(QColor)),
+ this, SLOT(on_color_changed(QColor)));
+
connect(decode_signal_.get(), SIGNAL(new_annotations()),
this, SLOT(on_new_annotations()));
connect(decode_signal_.get(), SIGNAL(decode_reset()),
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;
}
- vector<const Annotation*> annotations;
+ deque<const Annotation*> annotations;
decode_signal_->get_annotation_subset(annotations, r.decode_row,
current_segment_, sample_range.first, sample_range.second);
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;
r.expand_marker_highlighted = false;
if (hover_row) {
- int row_y = get_row_y(hover_row);
+ const pair<int, int> extents = v_extents();
+ const int trace_top = get_visual_y() + extents.first;
+ const int trace_btm = get_visual_y() + extents.second;
+
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() > trace_top) && (hp.y() < trace_btm)) {
+
hover_row->expand_marker_highlighted = true;
+ show_hidden_rows_ = true;
+ delayed_hidden_row_hider_.start();
+ }
}
// Tooltip handling
void DecodeTrace::mouse_left_press_event(const QMouseEvent* event)
{
+ // Update container widths which depend on the scrollarea's current width
+ update_expanded_rows();
+
// Handle row expansion marker
for (DecodeTraceRow& r : rows_) {
if (!r.expand_marker_highlighted)
} else {
r.expanding = true;
r.anim_shape = 0;
+
+ // Force geometry update of the widget container to get
+ // an up-to-date height (which also depends on the width)
+ forceUpdate(r.container);
+
r.container->setVisible(true);
- QApplication::processEvents();
- r.expanded_height = 5 * default_row_height_ + r.container->size().height();
+ r.expanded_height = 2 * default_row_height_ + r.container->sizeHint().height();
}
r.animation_step = 0;
r.anim_height = r.height;
- update_expanded_rows();
animation_timer_.start();
}
}
}
-void DecodeTrace::draw_annotations(vector<const Annotation*> annotations,
+void DecodeTrace::draw_annotations(deque<const Annotation*>& annotations,
QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row)
{
- Annotation::Class block_class = 0;
+ uint32_t block_class = 0;
bool block_class_uniform = true;
qreal block_start = 0;
int block_ann_count = 0;
// Annotation wider than the threshold for a useful label width?
if (a_width >= min_useful_label_width_) {
- for (const QString &ann_text : a->annotations()) {
+ for (const QString &ann_text : *(a->annotations())) {
const qreal w = p.boundingRect(QRectF(), 0, ann_text).width();
// Annotation wide enough to fit a label? Don't put it in a block then
if (w <= a_width) {
if (block_ann_count == 0) {
block_start = a_start;
- block_class = a->ann_class();
+ block_class = a->ann_class_id();
block_class_uniform = true;
} else
- if (a->ann_class() != block_class)
+ if (a->ann_class_id() != block_class)
block_class_uniform = false;
block_ann_count++;
const double start = a->start_sample() / samples_per_pixel - pixels_offset;
const double end = a->end_sample() / samples_per_pixel - pixels_offset;
- QColor color = row.ann_class_color.at(a->ann_class());
- p.setPen(color.darker());
- p.setBrush(color);
+ p.setPen(a->dark_color());
+ p.setBrush(a->color());
- if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding)
+ if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding)))
return;
if (a->start_sample() == a->end_sample())
}
void DecodeTrace::draw_annotation_block(qreal start, qreal end,
- Annotation::Class ann_class, bool use_ann_format, QPainter &p, int y,
+ uint32_t ann_class, bool use_ann_format, QPainter &p, int y,
const DecodeTraceRow& row) const
{
const double top = y + .5 - annotation_height_ / 2;
const double bottom = y + .5 + annotation_height_ / 2;
-
- const QRectF rect(start, top, end - start, bottom - top);
- const int r = annotation_height_ / 4;
-
- p.setPen(QPen(Qt::NoPen));
- p.setBrush(Qt::white);
- p.drawRoundedRect(rect, r, r);
+ const double width = end - start;
// If all annotations in this block are of the same type, we can use the
// one format that all of these annotations have. Otherwise, we should use
// a neutral color (i.e. gray)
if (use_ann_format) {
- const QColor color = row.ann_class_color.at(ann_class);
- p.setPen(color.darker());
- p.setBrush(QBrush(color, Qt::Dense4Pattern));
+ p.setPen(row.decode_row->get_dark_class_color(ann_class));
+ p.setBrush(QBrush(row.decode_row->get_class_color(ann_class), Qt::Dense4Pattern));
} else {
- p.setPen(Qt::gray);
+ p.setPen(QColor(Qt::darkGray));
p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern));
}
- p.drawRoundedRect(rect, r, r);
+ if (width <= 1)
+ p.drawLine(QPointF(start, top), QPointF(start, bottom));
+ else {
+ const QRectF rect(start, top, width, bottom - top);
+ const int r = annotation_height_ / 4;
+ p.drawRoundedRect(rect, r, r);
+ }
}
void DecodeTrace::draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const
{
- const QString text = a->annotations().empty() ?
- QString() : a->annotations().back();
+ const QString text = a->annotations()->empty() ?
+ QString() : a->annotations()->back();
const qreal w = min((qreal)p.boundingRect(QRectF(), 0, text).width(),
0.0) + annotation_height_;
const QRectF rect(x - w / 2, y - annotation_height_ / 2, w, annotation_height_);
{
const qreal top = y + .5 - annotation_height_ / 2;
const qreal bottom = y + .5 + annotation_height_ / 2;
- const vector<QString> annotations = a->annotations();
+ const vector<QString>* annotations = a->annotations();
// If the two ends are within 1 pixel, draw a vertical line
if (start + 1.0 > end) {
p.drawConvexPolygon(pts, countof(pts));
- if (annotations.empty())
+ if (annotations->empty())
return;
const int ann_start = start + cap_width;
QString best_annotation;
int best_width = 0;
- for (const QString &s : annotations) {
+ for (const QString &s : *annotations) {
const int w = p.boundingRect(QRectF(), 0, s).width();
if (w <= rect.width() && w > best_width)
best_annotation = s, best_width = w;
}
if (best_annotation.isEmpty())
- best_annotation = annotations.back();
+ best_annotation = annotations->back();
// If not ellide the last in the list
p.drawText(rect, Qt::AlignCenter, p.fontMetrics().elidedText(
const double pixels_offset =
((view->offset() - decode_signal_->start_time()) / scale).convert_to<double>();
- double samplerate = decode_signal_->samplerate();
+ double samplerate = decode_signal_->get_samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
return make_pair(start, end);
}
-QColor DecodeTrace::get_row_color(int row_index) const
-{
- // For each row color, use the base color hue and add an offset that's
- // not a dividend of 360
-
- QColor color;
- const int h = (base_->color().toHsv().hue() + 20 * row_index) % 360;
- const int s = DECODETRACE_COLOR_SATURATION;
- const int v = DECODETRACE_COLOR_VALUE;
- color.setHsl(h, s, v);
-
- return color;
-}
-
-QColor DecodeTrace::get_annotation_color(QColor row_color, int annotation_index) const
-{
- // For each row color, use the base color hue and add an offset that's
- // not a dividend of 360 and not a multiple of the row offset
-
- QColor color(row_color);
- const int h = (color.toHsv().hue() + 55 * annotation_index) % 360;
- const int s = DECODETRACE_COLOR_SATURATION;
- const int v = DECODETRACE_COLOR_VALUE;
- color.setHsl(h, s, v);
-
- return color;
-}
-
unsigned int DecodeTrace::get_row_y(const DecodeTraceRow* row) const
{
assert(row);
if (point.y() > (int)(get_row_y(r) + (annotation_height_ / 2)))
return QString();
- vector<const Annotation*> annotations;
+ deque<const Annotation*> annotations;
decode_signal_->get_annotation_subset(annotations, r->decode_row,
current_segment_, sample_range.first, sample_range.second);
return (annotations.empty()) ?
- QString() : annotations[0]->annotations().front();
+ QString() : annotations[0]->annotations()->front();
}
void DecodeTrace::create_decoder_form(int index, shared_ptr<Decoder> &dec,
QComboBox *selector = new QComboBox(parent);
- selector->addItem("-", qVariantFromValue((void*)nullptr));
+ selector->addItem("-", QVariant::fromValue((void*)nullptr));
if (!ch->assigned_signal)
selector->setCurrentIndex(0);
assert(b);
if (b->logic_data() && b->enabled()) {
selector->addItem(b->name(),
- qVariantFromValue((void*)b.get()));
+ QVariant::fromValue((void*)b.get()));
if (ch->assigned_signal == b.get())
selector->setCurrentIndex(selector->count() - 1);
{
QComboBox *selector = new QComboBox(parent);
- selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
- selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
- selector->addItem("X", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
+ selector->addItem("0", QVariant::fromValue((int)SRD_INITIAL_PIN_LOW));
+ selector->addItem("1", QVariant::fromValue((int)SRD_INITIAL_PIN_HIGH));
+ selector->addItem("X", QVariant::fromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
selector->setCurrentIndex(ch->initial_pin_state);
return selector;
}
-void DecodeTrace::export_annotations(vector<const Annotation*> *annotations) const
+void DecodeTrace::export_annotations(deque<const Annotation*>& annotations) const
{
GlobalSettings settings;
const QString dir = settings.value("MainWindow/SaveDirectory").toString();
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()));
+ for (const Annotation* ann : annotations) {
+ QString out_text = format;
+
+ 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);
+ }
+
+ if (has_dec_name)
+ out_text = out_text.replace("%d",
+ quote + QString::fromUtf8(ann->row()->decoder()->name()) + 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);
+ }
- const QString row_name = quote + ann->row()->description() + quote;
+ if (has_first_ann_text) {
+ const QString first_ann_text = quote + ann->annotations()->front() + quote;
+ out_text = out_text.replace("%1", first_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);
+ 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);
- const QString first_ann_text = quote + ann->annotations().front() + quote;
+ 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';
}
void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id)
{
+ // Set colors and fixed widths
QFontMetrics m(QApplication::font());
QPalette header_palette = owner_->view()->palette();
const int w = m.boundingRect(r->decode_row->title()).width() + RowTitleMargin;
r->title_width = w;
- r->container->resize(owner_->view()->viewport()->width() - r->container->pos().x(),
- r->expanded_height - 2 * default_row_height_);
- r->container->setVisible(false);
+ // Set up top-level container
+ connect(r->container, SIGNAL(widgetResized(QWidget*)),
+ this, SLOT(on_row_container_resized(QWidget*)));
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());
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::Fixed);
- r->selector_container->setMinimumSize(0, 3 * default_row_height_); // FIXME
- r->selector_container->setLayout(new QHBoxLayout());
+ r->selector_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ r->selector_container->setLayout(new FlowLayout(r->selector_container));
r->selector_container->setAutoFillBackground(true);
r->selector_container->setPalette(selector_palette);
for (const AnnotationClass* ann_class : ann_classes) {
cb = new QCheckBox();
cb->setText(tr(ann_class->description));
- cb->setChecked(ann_class->visible);
+ cb->setChecked(ann_class->visible());
+
+ int dim = ViewItemPaintParams::text_height() - 2;
+ QPixmap pixmap(dim, dim);
+ pixmap.fill(r->decode_row->get_class_color(ann_class->id));
+ 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 doesn't exist yet, create and append it
DecodeTraceRow nr;
nr.decode_row = decode_row;
+ nr.decode_row->set_base_color(base_->color());
nr.height = default_row_height_;
nr.expanded_height = default_row_height_;
nr.currently_visible = false;
nr.expanded = false;
nr.collapsing = false;
nr.expand_marker_shape = default_marker_shape_;
- nr.container = new QWidget(owner_->view()->scrollarea());
+ nr.container = new ContainerWidget(owner_->view()->scrollarea());
nr.header_container = new QWidget(nr.container);
nr.selector_container = new QWidget(nr.container);
- nr.row_color = get_row_color(decode_row->index());
-
- vector<AnnotationClass*> ann_classes = decode_row->ann_classes();
- for (const AnnotationClass* ann_class : ann_classes)
- nr.ann_class_color[ann_class->id] =
- get_annotation_color(nr.row_color, ann_class->id);
-
rows_.push_back(nr);
r = &rows_.back();
initialize_row_widgets(r, row_id);
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()
{
for (DecodeTraceRow& r : rows_) {
- r.container->move(2 * ArrowSize,
- get_row_y(&r) + default_row_height_);
-
- r.container->resize(owner_->view()->viewport()->width() - r.container->pos().x(),
- r.height - 2 * default_row_height_);
+ if (r.expanding || r.expanded)
+ r.expanded_height = 2 * default_row_height_ + r.container->sizeHint().height();
+
+ if (r.expanded)
+ r.height = r.expanded_height;
+
+ int x = 2 * ArrowSize;
+ int y = get_row_y(&r) + default_row_height_;
+ // Only update the position if it actually changes
+ if ((x != r.container->pos().x()) || (y != r.container->pos().y()))
+ r.container->move(x, y);
+
+ int w = owner_->view()->viewport()->width() - x;
+ int h = r.height - 2 * default_row_height_;
+ // Only update the dimension if they actually change
+ if ((w != r.container->sizeHint().width()) || (h != r.container->sizeHint().height()))
+ r.container->resize(w, h);
}
}
{
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_color_changed(const QColor &color)
+{
+ for (DecodeTraceRow& r : rows_)
+ r.decode_row->set_base_color(color);
+
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
}
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);
}
assert(ann_class_ptr);
AnnotationClass* ann_class = (AnnotationClass*)ann_class_ptr;
- ann_class->visible = !ann_class->visible;
+ ann_class->set_visible(!ann_class->visible());
void* row_ptr = sender->property("decode_trace_row_ptr").value<void*>();
assert(row_ptr);
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();
+
+ owner_->extents_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
+}
+
void DecodeTrace::on_copy_annotation_to_clipboard()
{
if (!selected_row_)
return;
- vector<const Annotation*> *annotations = new vector<const Annotation*>();
+ deque<const Annotation*> annotations;
- decode_signal_->get_annotation_subset(*annotations, selected_row_,
+ decode_signal_->get_annotation_subset(annotations, selected_row_,
current_segment_, selected_sample_range_.first, selected_sample_range_.first);
- if (annotations->empty())
+ if (annotations.empty())
return;
QClipboard *clipboard = QApplication::clipboard();
- clipboard->setText(annotations->front()->annotations().front(), QClipboard::Clipboard);
+ clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Clipboard);
if (clipboard->supportsSelection())
- clipboard->setText(annotations->front()->annotations().front(), QClipboard::Selection);
-
- delete annotations;
+ clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Selection);
}
void DecodeTrace::on_export_row()
if (!selected_row_)
return;
- vector<const Annotation*> *annotations = new vector<const Annotation*>();
+ deque<const Annotation*> annotations;
- decode_signal_->get_annotation_subset(*annotations, selected_row_,
+ decode_signal_->get_annotation_subset(annotations, selected_row_,
current_segment_, selected_sample_range_.first, selected_sample_range_.second);
- if (annotations->empty())
+ if (annotations.empty())
return;
export_annotations(annotations);
- delete annotations;
}
void DecodeTrace::on_export_all_rows_from_here()
{
- vector<const Annotation*> *annotations = new vector<const Annotation*>();
+ deque<const Annotation*> annotations;
- decode_signal_->get_annotation_subset(*annotations, current_segment_,
+ decode_signal_->get_annotation_subset(annotations, current_segment_,
selected_sample_range_.first, selected_sample_range_.second);
- if (!annotations->empty())
+ if (!annotations.empty())
export_annotations(annotations);
-
- delete annotations;
}
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
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