#include <tuple>
#include <boost/functional/hash.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
#include <QAction>
#include <QApplication>
using std::pair;
using std::shared_ptr;
using std::tie;
+using std::unordered_set;
using std::vector;
namespace pv {
assert(scale > 0);
const double pixels_offset =
- (view->offset() - decoder_stack_->start_time()) / scale;
+ ((view->offset() - decoder_stack_->start_time()) / scale).convert_to<double>();
double samplerate = decoder_stack_->samplerate();
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);
connect(group, SIGNAL(show_hide_decoder()),
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<binding::DecoderOptions> binding(
- new 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;
// 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;