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
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),
// 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()),
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 (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);
const double start = a->start_sample() / samples_per_pixel - pixels_offset;
const double end = a->end_sample() / samples_per_pixel - pixels_offset;
- p.setPen(row.ann_class_dark_color.at(a->ann_class_id()));
- p.setBrush(row.ann_class_color.at(a->ann_class_id()));
+ p.setPen(a->dark_color());
+ p.setBrush(a->color());
if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding)))
return;
// one format that all of these annotations have. Otherwise, we should use
// a neutral color (i.e. gray)
if (use_ann_format) {
- p.setPen(row.ann_class_dark_color.at(ann_class));
- p.setBrush(QBrush(row.ann_class_color.at(ann_class), 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(QColor(Qt::darkGray));
p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern));
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);
int dim = ViewItemPaintParams::text_height() - 2;
QPixmap pixmap(dim, dim);
- pixmap.fill(r->ann_class_color[ann_class->id]);
+ pixmap.fill(r->decode_row->get_class_color(ann_class->id));
cb->setIcon(pixmap);
r->selector_container->layout()->addWidget(cb);
// 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.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);
- nr.ann_class_dark_color[ann_class->id] =
- nr.ann_class_color[ann_class->id].darker();
- }
-
rows_.push_back(nr);
r = &rows_.back();
initialize_row_widgets(r, row_id);
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_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 (!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);
}
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
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);
}