namespace dialogs {
Decoder::Decoder(QWidget *parent, const srd_decoder *decoder,
- const vector< shared_ptr<view::Signal> > &sigs) :
+ const vector< shared_ptr<view::LogicSignal> > &sigs,
+ GHashTable *options) :
QDialog(parent),
- _decoder(decoder),
_sigs(sigs),
+ _binding(decoder, options),
_layout(this),
_form(this),
_form_layout(&_form),
_layout.addWidget(&_form);
_layout.addWidget(&_button_box);
- _form_layout.addRow(new QLabel("<h3>Probes</h3>", &_form));
+ _form_layout.addRow(new QLabel(tr("<h3>Probes</h3>"), &_form));
// Add the mandatory probes
for(probe = decoder->probes; probe; probe = probe->next) {
_form_layout.addRow(new QLabel(
tr("<i>* Required Probes</i>"), &_form));
+
+ // Add the options
+ if (!_binding.properties().empty()) {
+ _form_layout.addRow(new QLabel(tr("<h3>Options</h3>"),
+ &_form));
+ _binding.add_properties_to_form(&_form_layout);
+ }
+}
+
+void Decoder::accept()
+{
+ QDialog::accept();
+ _binding.commit();
}
QComboBox* Decoder::create_probe_selector(
selector->setCurrentIndex(0);
for(size_t i = 0; i < _sigs.size(); i++) {
- const shared_ptr<view::Signal> s(_sigs[i]);
+ const shared_ptr<view::LogicSignal> s(_sigs[i]);
assert(s);
- if (s->enabled()) {
+ if (s->enabled())
+ {
selector->addItem(s->get_name(), qVariantFromValue(i));
if(s->get_name().toLower().contains(
QString(name).toLower()))
return selector;
}
-map<const srd_probe*, shared_ptr<view::Signal> > Decoder::get_probes()
+map<const srd_probe*, shared_ptr<view::LogicSignal> > Decoder::get_probes()
{
- map<const srd_probe*, shared_ptr<view::Signal> > probe_map;
+ map<const srd_probe*, shared_ptr<view::LogicSignal> > probe_map;
for(map<const srd_probe*, QComboBox*>::const_iterator i =
_probe_selector_map.begin();
i != _probe_selector_map.end(); i++)
const int probe_index =
combo->itemData(combo->currentIndex()).value<int>();
if(probe_index >= 0) {
- shared_ptr<view::Signal> sig = _sigs[probe_index];
- if(dynamic_cast<pv::view::LogicSignal*>(sig.get()))
- probe_map[(*i).first] = sig;
- else
- qDebug() << "Currently only logic signals "
- "are supported for decoding";
+ shared_ptr<view::LogicSignal> sig = _sigs[probe_index];
+ probe_map[(*i).first] = sig;
}
}