#include <tuple>
#include <boost/functional/hash.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
#include <QAction>
#include <QApplication>
#include <QPushButton>
#include <QToolTip>
-#include "decodetrace.h"
-
-#include <pv/sigsession.h>
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/data/decode/annotation.h>
-#include <pv/view/logicsignal.h>
-#include <pv/view/view.h>
-#include <pv/view/viewport.h>
-#include <pv/widgets/decodergroupbox.h>
-#include <pv/widgets/decodermenu.h>
+#include "decodetrace.hpp"
+
+#include <pv/session.hpp>
+#include <pv/strnatcmp.hpp>
+#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsegment.hpp>
+#include <pv/data/decode/annotation.hpp>
+#include <pv/view/logicsignal.hpp>
+#include <pv/view/view.hpp>
+#include <pv/view/viewport.hpp>
+#include <pv/widgets/decodergroupbox.hpp>
+#include <pv/widgets/decodermenu.hpp>
using boost::shared_lock;
using boost::shared_mutex;
using std::pair;
using std::shared_ptr;
using std::tie;
+using std::unordered_set;
using std::vector;
namespace pv {
const int DecodeTrace::ArrowSize = 4;
const double DecodeTrace::EndCapWidth = 5;
+const int DecodeTrace::RowTitleMargin = 10;
const int DecodeTrace::DrawPadding = 100;
const QColor DecodeTrace::Colours[16] = {
QColor(0x6B, 0x23, 0x37)
};
-DecodeTrace::DecodeTrace(pv::SigSession &session,
+DecodeTrace::DecodeTrace(pv::Session &session,
std::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
Trace(QString::fromUtf8(
decoder_stack->stack().front()->decoder()->name)),
- _session(session),
- _decoder_stack(decoder_stack),
- _text_height(0),
- _row_height(0),
- _delete_mapper(this),
- _show_hide_mapper(this)
+ session_(session),
+ decoder_stack_(decoder_stack),
+ row_height_(0),
+ max_visible_rows_(0),
+ delete_mapper_(this),
+ show_hide_mapper_(this)
{
- assert(_decoder_stack);
+ assert(decoder_stack_);
- _colour = DecodeColours[index % countof(DecodeColours)];
+ set_colour(DecodeColours[index % countof(DecodeColours)]);
- connect(_decoder_stack.get(), SIGNAL(new_decode_data()),
+ connect(decoder_stack_.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
- connect(&_delete_mapper, SIGNAL(mapped(int)),
+ connect(&delete_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
- connect(&_show_hide_mapper, SIGNAL(mapped(int)),
+ connect(&show_hide_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_show_hide_decoder(int)));
}
const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
{
- return _decoder_stack;
+ return decoder_stack_;
}
pair<int, int> DecodeTrace::v_extents() const
{
- /// @todo Replace this with an implementation that knows the true
- /// height of the trace
- QFontMetrics m(QApplication::font());
- const int text_height = m.boundingRect(QRect(), 0, "Tg").height();
- const int row_height = (text_height * 6) / 4;
- return make_pair(-row_height / 2, row_height * 7 / 2);
+ const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
+
+ return make_pair(-row_height, row_height * max_visible_rows_);
}
-void DecodeTrace::paint_back(QPainter &p, int left, int right)
+void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- Trace::paint_back(p, left, right);
- paint_axis(p, get_visual_y(), left, right);
+ Trace::paint_back(p, pp);
+ paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p, int left, int right)
+void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
- QFontMetrics m(QApplication::font());
- _text_height = m.boundingRect(QRect(), 0, "Tg").height();
- _row_height = (_text_height * 6) / 4;
- const int annotation_height = (_text_height * 5) / 4;
-
- assert(_decoder_stack);
- const QString err = _decoder_stack->error_message();
- if (!err.isEmpty())
- {
- draw_unresolved_period(p, annotation_height, left, right);
- draw_error(p, err, left, right);
+ const int text_height = ViewItemPaintParams::text_height();
+ row_height_ = (text_height * 6) / 4;
+ const int annotation_height = (text_height * 5) / 4;
+
+ assert(decoder_stack_);
+ const QString err = decoder_stack_->error_message();
+ if (!err.isEmpty()) {
+ draw_unresolved_period(
+ p, annotation_height, pp.left(), pp.right());
+ draw_error(p, err, pp);
return;
}
// Iterate through the rows
int y = get_visual_y();
- pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
-
- assert(_decoder_stack);
- const vector<Row> rows(_decoder_stack->get_visible_rows());
-
- _visible_rows.clear();
- for (size_t i = 0; i < rows.size(); i++)
- {
- const Row &row = rows[i];
+ pair<uint64_t, uint64_t> sample_range = get_sample_range(
+ pp.left(), pp.right());
+
+ assert(decoder_stack_);
+ const vector<Row> rows(decoder_stack_->get_visible_rows());
+
+ visible_rows_.clear();
+ for (const Row& row : rows) {
+ // Cache the row title widths
+ int row_title_width;
+ try {
+ row_title_width = row_title_widths_.at(row);
+ } catch (std::out_of_range) {
+ const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
+ RowTitleMargin;
+ row_title_widths_[row] = w;
+ row_title_width = w;
+ }
+ // Determine the row's color
size_t base_colour = 0x13579BDF;
boost::hash_combine(base_colour, this);
boost::hash_combine(base_colour, row.decoder());
base_colour >>= 16;
vector<Annotation> annotations;
- _decoder_stack->get_annotation_subset(annotations, row,
+ 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, get_text_colour(),
- annotation_height, left, right, y,
- base_colour);
- y += _row_height;
+ draw_annotations(annotations, p, annotation_height, pp, y,
+ base_colour, row_title_width);
+
+ y += row_height_;
- _visible_rows.push_back(rows[i]);
+ visible_rows_.push_back(row);
}
}
// Draw the hatching
- draw_unresolved_period(p, annotation_height, left, right);
+ draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
+
+ // Update the maximum row count if needed
+ max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
}
-void DecodeTrace::paint_fore(QPainter &p, int left, int right)
+void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
- (void)right;
-
- assert(_row_height);
+ assert(row_height_);
- for (size_t i = 0; i < _visible_rows.size(); i++)
- {
- const int y = i * _row_height + get_visual_y();
+ 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(left, y - ArrowSize),
- QPointF(left + ArrowSize, y),
- QPointF(left, y + ArrowSize)
+ QPointF(pp.left(), y - ArrowSize),
+ QPointF(pp.left() + ArrowSize, y),
+ QPointF(pp.left(), y + ArrowSize)
};
p.drawPolygon(points, countof(points));
}
- const QRect r(left + ArrowSize * 2, y - _row_height / 2,
- right - left, _row_height);
- const QString h(_visible_rows[i].title());
+ const QRect r(pp.left() + ArrowSize * 2, y - row_height_ / 2,
+ pp.right() - pp.left(), row_height_);
+ const QString h(visible_rows_[i].title());
const int f = Qt::AlignLeft | Qt::AlignVCenter |
Qt::TextDontClip;
assert(form);
assert(parent);
- assert(_decoder_stack);
+ assert(decoder_stack_);
// Add the standard options
Trace::populate_popup_form(parent, form);
// Add the decoder options
- _bindings.clear();
- _channel_selectors.clear();
- _decoder_forms.clear();
+ bindings_.clear();
+ channel_selectors_.clear();
+ decoder_forms_.clear();
- const list< shared_ptr<Decoder> >& stack = _decoder_stack->stack();
+ 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, int row_title_width)
+{
+ using namespace pv::data::decode;
+
+ vector<Annotation> a_block;
+ int p_end = INT_MIN;
+
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ // Sort the annotations by start sample so that decoders
+ // can't confuse us by creating annotations out of order
+ stable_sort(annotations.begin(), annotations.end(),
+ [](const Annotation &a, const Annotation &b) {
+ return a.start_sample() < b.start_sample(); });
+
+ // Gather all annotations that form a visual "block" and draw them as such
+ for (const Annotation &a : annotations) {
+
+ const int a_start = a.start_sample() / samples_per_pixel - pixels_offset;
+ const int a_end = a.end_sample() / samples_per_pixel - pixels_offset;
+ const int a_width = a_end - a_start;
+
+ const int delta = a_end - p_end;
+
+ bool a_is_separate = false;
+
+ // Annotation wider than the threshold for a useful label width?
+ if (a_width > 20) {
+ for (const QString &ann_text : a.annotations()) {
+ const int 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) {
+ a_is_separate = true;
+ break;
+ }
+ }
+ }
+
+ // Were the previous and this annotation more than a pixel apart?
+ if ((abs(delta) > 1) || a_is_separate) {
+ // Block was broken, draw annotations that form the current block
+ if (a_block.size() == 1) {
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour,
+ row_title_width);
+ }
+ else
+ draw_annotation_block(a_block, p, h, y, base_colour);
+
+ a_block.clear();
+ }
+
+ if (a_is_separate) {
+ draw_annotation(a, p, h, pp, y, base_colour, row_title_width);
+ // Next annotation must start a new block. delta will be > 1
+ // because we set p_end to INT_MIN but that's okay since
+ // a_block will be empty, so nothing will be drawn
+ p_end = INT_MIN;
+ } else {
+ a_block.push_back(a);
+ p_end = a_end;
+ }
+ }
+
+ if (a_block.size() == 1)
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour,
+ row_title_width);
+ else
+ draw_annotation_block(a_block, p, h, y, base_colour);
+}
+
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
- QPainter &p, QColor text_color, int h, int left, int right, int y,
- size_t base_colour) const
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width) const
{
double samples_per_pixel, pixels_offset;
tie(pixels_offset, samples_per_pixel) =
pixels_offset;
const size_t colour = (base_colour + a.format()) % countof(Colours);
- const QColor &fill = Colours[colour];
- const QColor &outline = OutlineColours[colour];
+ p.setPen(OutlineColours[colour]);
+ p.setBrush(Colours[colour]);
- if (start > right + DrawPadding || end < left - DrawPadding)
+ if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding)
return;
if (a.start_sample() == a.end_sample())
- draw_instant(a, p, fill, outline, text_color, h,
- start, y);
+ draw_instant(a, p, h, start, y);
else
- draw_range(a, p, fill, outline, text_color, h,
- start, end, y);
+ draw_range(a, p, h, start, end, y, pp,
+ row_title_width);
+}
+
+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;
+
+ if (annotations.empty())
+ return;
+
+ 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 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)
+ const int format = annotations.front().format();
+ const bool single_format = std::all_of(
+ annotations.begin(), annotations.end(),
+ [&](const Annotation &a) { return a.format() == format; });
+
+ p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
+ p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
+ Qt::Dense4Pattern));
+ p.drawRoundedRect(
+ QRectF(start, top, end - start, bottom - top), h/4, h/4);
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double x, int y) const
+ int h, double x, int y) const
{
const QString text = a.annotations().empty() ?
QString() : a.annotations().back();
0.0) + h;
const QRectF rect(x - w / 2, y - h / 2, w, h);
- p.setPen(outline);
- p.setBrush(fill);
p.drawRoundedRect(rect, h / 2, h / 2);
- p.setPen(text_color);
+ p.setPen(Qt::black);
p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
}
void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double start,
- double end, int y) const
+ int h, double start, double end, int y, const ViewItemPaintParams &pp,
+ int row_title_width) const
{
const double top = y + .5 - h / 2;
const double bottom = y + .5 + h / 2;
const vector<QString> annotations = a.annotations();
- p.setPen(outline);
- 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;
}
if (annotations.empty())
return;
- QRectF rect(start + cap_width, y - h / 2,
- end - start - cap_width * 2, h);
+ const int ann_start = start + cap_width;
+ const int ann_end = end - cap_width;
+
+ const int real_start = std::max(ann_start, pp.left() + row_title_width);
+ const int real_end = std::min(ann_end, pp.right());
+ const int real_width = real_end - real_start;
+
+ QRectF rect(real_start, y - h / 2, real_width, h);
if (rect.width() <= 4)
return;
- p.setPen(text_color);
+ p.setPen(Qt::black);
// Try to find an annotation that will fit
QString best_annotation;
}
void DecodeTrace::draw_error(QPainter &p, const QString &message,
- int left, int right)
+ const ViewItemPaintParams &pp)
{
const int y = get_visual_y();
p.setBrush(ErrorBgColour);
const QRectF bounding_rect =
- QRectF(left, INT_MIN / 2 + y, right - left, INT_MAX);
+ QRectF(pp.width(), INT_MIN / 2 + y, pp.width(), INT_MAX);
const QRectF text_rect = p.boundingRect(bounding_rect,
Qt::AlignCenter, message);
const float r = text_rect.height() / 4;
p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
Qt::AbsoluteSize);
- p.setPen(get_text_colour());
+ p.setPen(Qt::black);
p.drawText(text_rect, message);
}
double samples_per_pixel, pixels_offset;
- assert(_decoder_stack);
+ assert(decoder_stack_);
shared_ptr<Logic> data;
shared_ptr<LogicSignal> logic_signal;
- const list< shared_ptr<Decoder> > &stack = _decoder_stack->stack();
+ const list< shared_ptr<Decoder> > &stack = decoder_stack_->stack();
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/snapshot
+ // LogicSignals have the same data/segment
for (const shared_ptr<Decoder> &dec : stack)
if (dec && !dec->channels().empty() &&
((logic_signal = (*dec->channels().begin()).second)) &&
((data = logic_signal->logic_data())))
break;
- if (!data || data->get_snapshots().empty())
+ if (!data || data->logic_segments().empty())
return;
- const shared_ptr<LogicSnapshot> snapshot =
- data->get_snapshots().front();
- assert(snapshot);
- const int64_t sample_count = (int64_t)snapshot->get_sample_count();
+ const shared_ptr<LogicSegment> segment =
+ data->logic_segments().front();
+ assert(segment);
+ const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
return;
- const int64_t samples_decoded = _decoder_stack->samples_decoded();
+ const int64_t samples_decoded = decoder_stack_->samples_decoded();
if (sample_count == samples_decoded)
return;
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
- assert(_owner);
- assert(_decoder_stack);
+ assert(owner_);
+ assert(decoder_stack_);
- const View *view = _owner->view();
+ const View *view = owner_->view();
assert(view);
const double scale = view->scale();
assert(scale > 0);
const double pixels_offset =
- (view->offset() - _decoder_stack->get_start_time()) / scale;
+ ((view->offset() - decoder_stack_->start_time()) / scale).convert_to<double>();
- double samplerate = _decoder_stack->samplerate();
+ double samplerate = decoder_stack_->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
int DecodeTrace::get_row_at_point(const QPoint &point)
{
- if (!_row_height)
+ if (!row_height_)
return -1;
- const int row = (point.y() - get_visual_y() + _row_height / 2) /
- _row_height;
- if (row < 0 || row >= (int)_visible_rows.size())
+ const int y = (point.y() - get_visual_y() + row_height_ / 2);
+
+ /* Integer divison of (x-1)/x would yield 0, so we check for this. */
+ if (y < 0)
+ return -1;
+
+ const int row = y / row_height_;
+
+ if (row >= (int)visible_rows_.size())
return -1;
return row;
vector<pv::data::decode::Annotation> annotations;
- assert(_decoder_stack);
- _decoder_stack->get_annotation_subset(annotations, _visible_rows[row],
+ assert(decoder_stack_);
+ decoder_stack_->get_annotation_subset(annotations, visible_rows_[row],
sample_range.first, sample_range.second);
return (annotations.empty()) ?
QString() : annotations[0].annotations().front();
}
-void DecodeTrace::hide_hover_annotation()
-{
- QToolTip::hideText();
-}
-
void DecodeTrace::hover_point_changed()
{
- assert(_owner);
+ assert(owner_);
- const View *const view = _owner->view();
+ const View *const view = owner_->view();
assert(view);
QPoint hp = view->hover_point();
QString ann = get_annotation_at_point(hp);
assert(view);
- assert(_row_height);
- if (ann.isEmpty()) {
- hide_hover_annotation();
+ if (!row_height_ || ann.isEmpty()) {
+ QToolTip::hideText();
return;
}
// decode trace, not below.
hp.setX(hp.x() - (text_size.width() / 2) - padding);
- hp.setY(get_visual_y() - (_row_height / 2) +
- (hover_row * _row_height) -
- _row_height - text_size.height());
+ hp.setY(get_visual_y() - (row_height_ / 2) +
+ (hover_row * row_height_) -
+ row_height_ - text_size.height() - padding);
QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
}
const srd_decoder *const decoder = dec->decoder();
assert(decoder);
+ const bool decoder_deletable = index > 0;
+
pv::widgets::DecoderGroupBox *const group =
new pv::widgets::DecoderGroupBox(
- QString::fromUtf8(decoder->name));
+ QString::fromUtf8(decoder->name), nullptr, decoder_deletable);
group->set_decoder_visible(dec->shown());
- _delete_mapper.setMapping(group, index);
- connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));
+ if (decoder_deletable) {
+ delete_mapper_.setMapping(group, index);
+ connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map()));
+ }
- _show_hide_mapper.setMapping(group, index);
+ show_hide_mapper_.setMapping(group, index);
connect(group, SIGNAL(show_hide_decoder()),
- &_show_hide_mapper, SLOT(map()));
+ &show_hide_mapper_, SLOT(map()));
QFormLayout *const decoder_form = new QFormLayout;
group->add_layout(decoder_form);
// Add the mandatory channels
- for(l = decoder->channels; l; l = l->next) {
+ for (l = decoder->channels; l; l = l->next) {
const struct srd_channel *const pdch =
(struct srd_channel *)l->data;
QComboBox *const combo = create_channel_selector(parent, dec, pdch);
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%2) *")
- .arg(QString::fromUtf8(pdch->name))
- .arg(QString::fromUtf8(pdch->desc)), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
const ChannelSelector s = {combo, dec, pdch};
- _channel_selectors.push_back(s);
+ channel_selectors_.push_back(s);
}
// Add the optional channels
- for(l = decoder->opt_channels; l; l = l->next) {
+ for (l = decoder->opt_channels; l; l = l->next) {
const struct srd_channel *const pdch =
(struct srd_channel *)l->data;
QComboBox *const combo = create_channel_selector(parent, dec, pdch);
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%2)")
- .arg(QString::fromUtf8(pdch->name))
- .arg(QString::fromUtf8(pdch->desc)), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
const ChannelSelector s = {combo, dec, pdch};
- _channel_selectors.push_back(s);
+ channel_selectors_.push_back(s);
}
// Add the options
- shared_ptr<prop::binding::DecoderOptions> binding(
- new prop::binding::DecoderOptions(_decoder_stack, dec));
+ shared_ptr<binding::Decoder> binding(
+ new binding::Decoder(decoder_stack_, dec));
binding->add_properties_to_form(decoder_form, true);
- _bindings.push_back(binding);
+ bindings_.push_back(binding);
form->addRow(group);
- _decoder_forms.push_back(group);
+ decoder_forms_.push_back(group);
}
QComboBox* DecodeTrace::create_channel_selector(
{
assert(dec);
- shared_lock<shared_mutex> lock(_session.signals_mutex());
- const vector< shared_ptr<Signal> > &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(),
+ [](const shared_ptr<Signal> &a, const shared_ptr<Signal> b) {
+ return strnatcasecmp(a->name().toStdString(),
+ b->name().toStdString()) < 0; });
- assert(_decoder_stack);
+ assert(decoder_stack_);
const auto channel_iter = dec->channels().find(pdch);
QComboBox *selector = new QComboBox(parent);
- selector->addItem("-", qVariantFromValue((void*)NULL));
+ selector->addItem("-", qVariantFromValue((void*)nullptr));
if (channel_iter == dec->channels().end())
selector->setCurrentIndex(0);
- for(size_t i = 0; i < sigs.size(); i++) {
- const shared_ptr<view::Signal> s(sigs[i]);
+ 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)
- selector->setCurrentIndex(i + 1);
+
+ 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 vector< shared_ptr<Signal> > &sigs(_session.signals());
+ const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
- for (const ChannelSelector &s : _channel_selectors)
- {
- if(s._decoder != dec)
+ for (const ChannelSelector &s : channel_selectors_) {
+ if (s.decoder_ != dec)
break;
const LogicSignal *const selection =
- (LogicSignal*)s._combo->itemData(
- s._combo->currentIndex()).value<void*>();
+ (LogicSignal*)s.combo_->itemData(
+ s.combo_->currentIndex()).value<void*>();
for (shared_ptr<Signal> sig : sigs)
- if(sig.get() == selection) {
- channel_map[s._pdch] =
+ if (sig.get() == selection) {
+ channel_map[s.pdch_] =
dynamic_pointer_cast<LogicSignal>(sig);
break;
}
void DecodeTrace::commit_channels()
{
- assert(_decoder_stack);
- for (shared_ptr<data::decode::Decoder> dec : _decoder_stack->stack())
+ assert(decoder_stack_);
+ for (shared_ptr<data::decode::Decoder> dec : decoder_stack_->stack())
commit_decoder_channels(dec);
- _decoder_stack->begin_decode();
+ decoder_stack_->begin_decode();
}
void DecodeTrace::on_new_decode_data()
{
- if (_owner)
- _owner->update_viewport();
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
}
void DecodeTrace::delete_pressed()
void DecodeTrace::on_delete()
{
- _session.remove_decode_signal(this);
+ session_.remove_decode_signal(this);
}
void DecodeTrace::on_channel_selected(int)
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
assert(decoder);
- assert(_decoder_stack);
- _decoder_stack->push(shared_ptr<data::decode::Decoder>(
+ assert(decoder_stack_);
+ decoder_stack_->push(shared_ptr<data::decode::Decoder>(
new data::decode::Decoder(decoder)));
- _decoder_stack->begin_decode();
+ decoder_stack_->begin_decode();
create_popup_form();
}
void DecodeTrace::on_delete_decoder(int index)
{
- _decoder_stack->remove(index);
+ decoder_stack_->remove(index);
// Update the popup
create_popup_form();
- _decoder_stack->begin_decode();
+ decoder_stack_->begin_decode();
}
void DecodeTrace::on_show_hide_decoder(int index)
{
using pv::data::decode::Decoder;
- const list< shared_ptr<Decoder> > stack(_decoder_stack->stack());
+ const list< shared_ptr<Decoder> > stack(decoder_stack_->stack());
// Find the decoder in the stack
auto iter = stack.cbegin();
- for(int i = 0; i < index; i++, iter++)
+ for (int i = 0; i < index; i++, iter++)
assert(iter != stack.end());
shared_ptr<Decoder> dec = *iter;
const bool show = !dec->shown();
dec->show(show);
- assert(index < (int)_decoder_forms.size());
- _decoder_forms[index]->set_decoder_visible(show);
+ assert(index < (int)decoder_forms_.size());
+ decoder_forms_[index]->set_decoder_visible(show);
- _owner->update_viewport();
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
}
} // namespace view
projects / pulseview.git / blobdiff