using std::pair;
using std::shared_ptr;
using std::tie;
+using std::unordered_set;
using std::vector;
namespace pv {
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)
{
/// @todo Replace this with an implementation that knows the true
/// height of the trace
- const int row_height = (RowItemPaintParams::text_height() * 6) / 4;
+ const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
return make_pair(-row_height / 2, row_height * 7 / 2);
}
-void DecodeTrace::paint_back(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
- text_height_ = RowItemPaintParams::text_height();
- row_height_ = (text_height_ * 6) / 4;
- const int annotation_height = (text_height_ * 5) / 4;
+ 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();
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
}
-void DecodeTrace::paint_fore(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
}
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
- QPainter &p, int h, const RowItemPaintParams &pp, int y,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
size_t base_colour) const
{
double samples_per_pixel, pixels_offset;
}
void DecodeTrace::draw_error(QPainter &p, const QString &message,
- const RowItemPaintParams &pp)
+ const ViewItemPaintParams &pp)
{
const int y = get_visual_y();
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);
}
// 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);
}
// 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);
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 a->name().compare(b->name()) < 0; });
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())
{
selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
- selector->setCurrentIndex(i + 1);
+ 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)
+ if (s.decoder_ != dec)
break;
const LogicSignal *const selection =
s.combo_->currentIndex()).value<void*>();
for (shared_ptr<Signal> sig : sigs)
- if(sig.get() == selection) {
+ if (sig.get() == selection) {
channel_map[s.pdch_] =
dynamic_pointer_cast<LogicSignal>(sig);
break;
void DecodeTrace::on_new_decode_data()
{
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
}
void DecodeTrace::delete_pressed()
// 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;
decoder_forms_[index]->set_decoder_visible(show);
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
}
} // namespace view