{
assert(decoder_stack_);
- colour_ = DecodeColours[index % countof(DecodeColours)];
+ set_colour(DecodeColours[index % countof(DecodeColours)]);
connect(decoder_stack_.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
pair<int, int> DecodeTrace::v_extents() const
{
- /// @todo Replace this with an implementation that knows the true
- /// height of the trace
const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
- return make_pair(-row_height / 2, row_height * 7 / 2);
+ const int rows = visible_rows_.size();
+
+ return make_pair(-row_height, row_height * rows);
}
void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
assert(decoder_stack_);
const QString err = decoder_stack_->error_message();
- if (!err.isEmpty())
- {
+ if (!err.isEmpty()) {
draw_unresolved_period(
p, annotation_height, pp.left(), pp.right());
draw_error(p, err, pp);
const vector<Row> rows(decoder_stack_->get_visible_rows());
visible_rows_.clear();
- for (size_t i = 0; i < rows.size(); i++)
- {
+ for (size_t i = 0; i < rows.size(); i++) {
const Row &row = rows[i];
size_t base_colour = 0x13579BDF;
decoder_stack_->get_annotation_subset(annotations, row,
sample_range.first, sample_range.second);
if (!annotations.empty()) {
- for (const Annotation &a : annotations)
- draw_annotation(a, p, annotation_height,
- pp, y, base_colour);
+ draw_annotations(annotations, p, annotation_height, pp, y,
+ base_colour);
+
y += row_height_;
visible_rows_.push_back(rows[i]);
assert(row_height_);
- for (size_t i = 0; i < visible_rows_.size(); i++)
- {
+ for (size_t i = 0; i < visible_rows_.size(); i++) {
const int y = i * row_height_ + get_visual_y();
p.setPen(QPen(Qt::NoPen));
p.setBrush(QApplication::palette().brush(QPalette::WindowText));
- if (i != 0)
- {
+ if (i != 0) {
const QPointF points[] = {
QPointF(pp.left(), y - ArrowSize),
QPointF(pp.left() + ArrowSize, y),
const list< shared_ptr<Decoder> >& stack = decoder_stack_->stack();
- if (stack.empty())
- {
+ if (stack.empty()) {
QLabel *const l = new QLabel(
tr("<p><i>No decoders in the stack</i></p>"));
l->setAlignment(Qt::AlignCenter);
form->addRow(l);
- }
- else
- {
+ } else {
auto iter = stack.cbegin();
for (int i = 0; i < (int)stack.size(); i++, iter++) {
shared_ptr<Decoder> dec(*iter);
return menu;
}
+void DecodeTrace::draw_annotations(vector<pv::data::decode::Annotation> annotations,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour)
+{
+ using namespace pv::data::decode;
+
+ vector<Annotation> a_block;
+ int prev_ann_pos = INT_MIN;
+
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ // Gather all annotations that form a visual "block" and draw them as such
+ for (const Annotation &a : annotations) {
+
+ const int end = a.end_sample() / samples_per_pixel - pixels_offset;
+ const int delta = end - prev_ann_pos;
+
+ // Some annotations are in reverse order, so we cannot
+ // simply check for delta > 1
+ if (abs(delta) > 1) {
+ // Block was broken, draw it
+ if (a_block.size() == 1)
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour);
+ else
+ if (a_block.size() > 0)
+ draw_annotation_block(a_block, p, h, y, base_colour);
+
+ a_block.clear();
+ }
+
+ a_block.push_back(a);
+ prev_ann_pos = end;
+ }
+
+ if (a_block.size() == 1)
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour);
+ else
+ draw_annotation_block(a_block, p, h, y, base_colour);
+}
+
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
QPainter &p, int h, const ViewItemPaintParams &pp, int y,
size_t base_colour) const
draw_range(a, p, fill, outline, h, start, end, y);
}
+void DecodeTrace::draw_annotation_block(
+ vector<pv::data::decode::Annotation> annotations, QPainter &p, int h,
+ int y, size_t base_colour) const
+{
+ using namespace pv::data::decode;
+
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ const double start = annotations.front().start_sample() /
+ samples_per_pixel - pixels_offset;
+ const double end = annotations.back().end_sample() /
+ samples_per_pixel - pixels_offset;
+
+ const double top = y + .5 - h / 2;
+ const double bottom = y + .5 + h / 2;
+ const double cap_width = min((end - start) / 4, EndCapWidth);
+
+ QPointF pts[] = {
+ QPointF(start, y + .5f),
+ QPointF(start + cap_width, top),
+ QPointF(end - cap_width, top),
+ QPointF(end, y + .5f),
+ QPointF(end - cap_width, bottom),
+ QPointF(start + cap_width, bottom)
+ };
+
+ const size_t colour = (base_colour + annotations.front().format()) %
+ countof(Colours);
+
+ // Check if all annotations are of the same type (i.e. we can use one color)
+ // or if we should use a neutral color (i.e. gray)
+ bool single_format = true;
+ int format = annotations.front().format();
+
+ for (const Annotation &a : annotations)
+ if (a.format() != format) {
+ single_format = false;
+ break;
+ }
+
+ p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
+ p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
+ Qt::Dense4Pattern));
+
+ p.drawConvexPolygon(pts, countof(pts));
+}
+
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
QColor fill, QColor outline, int h, double x, int y) const
{
p.setBrush(fill);
// If the two ends are within 1 pixel, draw a vertical line
- if (start + 1.0 > end)
- {
+ if (start + 1.0 > end) {
p.drawLine(QPointF(start, top), QPointF(start, bottom));
return;
}
{
assert(dec);
- shared_lock<shared_mutex> lock(session_.signals_mutex());
- const auto &sigs(session_.signals());
+ const auto sigs(session_.signals());
vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
std::sort(sig_list.begin(), sig_list.end(),
for (const shared_ptr<view::Signal> &s : sig_list) {
assert(s);
- if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
- {
+ if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled()) {
selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
- if ((*channel_iter).second == s)
+
+ if (channel_iter != dec->channels().end() &&
+ (*channel_iter).second == s)
selector->setCurrentIndex(
selector->count() - 1);
}
map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
- shared_lock<shared_mutex> lock(session_.signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
+ const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
- for (const ChannelSelector &s : channel_selectors_)
- {
+ for (const ChannelSelector &s : channel_selectors_) {
if (s.decoder_ != dec)
break;
projects / pulseview.git / blobdiff