X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=2d641827f13bbd8416f09baa62f74c18cdce5a47;hp=51b17e5e14269d236acdde3dba578d39b36c47f5;hb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;hpb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 51b17e5e..2d641827 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -27,6 +27,7 @@ extern "C" { #include #include +#include #include #include #include @@ -37,9 +38,13 @@ extern "C" { #include #include +#include +#include +#include #include #include #include +#include #include using namespace boost; @@ -56,12 +61,13 @@ const QColor DecodeTrace::DecodeColours[4] = { }; const QColor DecodeTrace::ErrorBgColour = QColor(0xEF, 0x29, 0x29); +const QColor DecodeTrace::NoDecodeColour = QColor(0x88, 0x8A, 0x85); DecodeTrace::DecodeTrace(pv::SigSession &session, boost::shared_ptr decoder_stack, int index) : - Trace(session, QString(decoder_stack->decoder()->name)), + Trace(session, QString(decoder_stack->stack().front()->decoder()->name)), _decoder_stack(decoder_stack), - _binding(decoder_stack) + _delete_mapper(this) { assert(_decoder_stack); @@ -69,6 +75,8 @@ DecodeTrace::DecodeTrace(pv::SigSession &session, connect(_decoder_stack.get(), SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data())); + connect(&_delete_mapper, SIGNAL(mapped(int)), + this, SLOT(on_delete_decoder(int))); } bool DecodeTrace::enabled() const @@ -89,6 +97,7 @@ void DecodeTrace::set_view(pv::view::View *view) void DecodeTrace::paint_back(QPainter &p, int left, int right) { + Trace::paint_back(p, left, right); paint_axis(p, get_y(), left, right); } @@ -96,20 +105,10 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) { using namespace pv::view::decode; - assert(_decoder_stack); - const QString err = _decoder_stack->error_message(); - if (!err.isEmpty()) { - draw_error(p, err, left, right); - return; - } - - assert(_view); - const int y = get_y(); - const double scale = _view->scale(); assert(scale > 0); - double samplerate = _decoder_stack->get_samplerate(); + double samplerate = _decoder_stack->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) @@ -119,74 +118,79 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) _decoder_stack->get_start_time()) / scale; const double samples_per_pixel = samplerate * scale; + QFontMetrics m(QApplication::font()); + const int h = (m.boundingRect(QRect(), 0, "Tg").height() * 5) / 4; + + assert(_decoder_stack); + const QString err = _decoder_stack->error_message(); + if (!err.isEmpty()) + { + draw_error(p, err, left, right); + draw_unresolved_period(p, h, left, right, samples_per_pixel, + pixels_offset); + return; + } + + assert(_view); + const int y = get_y(); + assert(_decoder_stack); vector< shared_ptr > annotations(_decoder_stack->annotations()); BOOST_FOREACH(shared_ptr a, annotations) { assert(a); - a->paint(p, get_text_colour(), _text_size.height(), - left, right, samples_per_pixel, pixels_offset, y); + a->paint(p, get_text_colour(), h, left, right, + samples_per_pixel, pixels_offset, y); } + + draw_unresolved_period(p, h, left, right, + samples_per_pixel, pixels_offset); } void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { - const GSList *probe; + using pv::data::decode::Decoder; assert(form); assert(parent); assert(_decoder_stack); - const srd_decoder *const decoder = _decoder_stack->decoder(); - - assert(decoder); - + // Add the standard options Trace::populate_popup_form(parent, form); - form->addRow(new QLabel(tr("

Probes

"), parent)); - - _probe_selector_map.clear(); - - // Add the mandatory probes - for(probe = decoder->probes; probe; probe = probe->next) { - const struct srd_probe *const p = - (struct srd_probe *)probe->data; - QComboBox *const combo = create_probe_selector(parent, p); - connect(combo, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_probe_selected(int))); - form->addRow(tr("%1 (%2) *") - .arg(p->name).arg(p->desc), combo); - - _probe_selector_map[p] = combo; - } + // Add the decoder options + _bindings.clear(); + _probe_selectors.clear(); - // Add the optional probes - for(probe = decoder->opt_probes; probe; probe = probe->next) { - const struct srd_probe *const p = - (struct srd_probe *)probe->data; - QComboBox *const combo = create_probe_selector(parent, p); - connect(combo, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_probe_selected(int))); - form->addRow(tr("%1 (%2)") - .arg(p->name).arg(p->desc), combo); + const list< shared_ptr >& stack = _decoder_stack->stack(); - _probe_selector_map[p] = combo; + if (stack.empty()) + { + QLabel *const l = new QLabel( + tr("

No decoders in the stack

")); + l->setAlignment(Qt::AlignCenter); + form->addRow(l); } + else + { + list< shared_ptr >::const_iterator iter = + stack.begin(); + for (int i = 0; i < (int)stack.size(); i++, iter++) { + shared_ptr dec(*iter); + create_decoder_form(i, dec, parent, form); + } - form->addRow(new QLabel( - tr("* Required Probes"), parent)); - - // Add the options - if (!_binding.properties().empty()) { - form->addRow(new QLabel(tr("

Options

"), - parent)); - _binding.add_properties_to_form(form, true); + form->addRow(new QLabel( + tr("* Required Probes"), parent)); } // Add stacking button - QPushButton *const stack_button = - new QPushButton(tr("Stack DecoderStack"), parent); pv::widgets::DecoderMenu *const decoder_menu = new pv::widgets::DecoderMenu(parent); + connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)), + this, SLOT(on_stack_decoder(srd_decoder*))); + + QPushButton *const stack_button = + new QPushButton(tr("Stack Decoder"), parent); stack_button->setMenu(decoder_menu); QHBoxLayout *stack_button_box = new QHBoxLayout; @@ -229,21 +233,133 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.drawText(text_rect, message); } +void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, + int right, double samples_per_pixel, double pixels_offset) +{ + using namespace pv::data; + using pv::data::decode::Decoder; + + assert(_decoder_stack); + + shared_ptr data; + shared_ptr logic_signal; + + const list< shared_ptr > &stack = _decoder_stack->stack(); + + // We get the logic data of the first probe in the list. + // This works because we are currently assuming all + // LogicSignals have the same data/snapshot + BOOST_FOREACH (const shared_ptr &dec, stack) + if (dec && !dec->probes().empty() && + ((logic_signal = (*dec->probes().begin()).second)) && + ((data = logic_signal->logic_data()))) + break; + + if (!data || data->get_snapshots().empty()) + return; + + const shared_ptr snapshot = + data->get_snapshots().front(); + assert(snapshot); + const int64_t sample_count = (int64_t)snapshot->get_sample_count(); + if (sample_count == 0) + return; + + const int64_t samples_decoded = _decoder_stack->samples_decoded(); + if (sample_count == samples_decoded) + return; + + const int y = get_y(); + const double start = max(samples_decoded / + samples_per_pixel - pixels_offset, left - 1.0); + const double end = min(sample_count / samples_per_pixel - + pixels_offset, right + 1.0); + const QRectF no_decode_rect(start, y - h/2 + 0.5, end - start, h); + + p.setPen(QPen(Qt::NoPen)); + p.setBrush(Qt::white); + p.drawRect(no_decode_rect); + + p.setPen(NoDecodeColour); + p.setBrush(QBrush(NoDecodeColour, Qt::Dense6Pattern)); + p.drawRect(no_decode_rect); +} + +void DecodeTrace::create_decoder_form(int index, + shared_ptr &dec, QWidget *parent, + QFormLayout *form) +{ + const GSList *probe; + + assert(dec); + const srd_decoder *const decoder = dec->decoder(); + assert(decoder); + + pv::widgets::DecoderGroupBox *const group = + new pv::widgets::DecoderGroupBox(decoder->name); + + _delete_mapper.setMapping(group, index); + connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map())); + + QFormLayout *const decoder_form = new QFormLayout; + group->add_layout(decoder_form); + + // Add the mandatory probes + for(probe = decoder->probes; probe; probe = probe->next) { + const struct srd_probe *const p = + (struct srd_probe *)probe->data; + QComboBox *const combo = create_probe_selector(parent, dec, p); + connect(combo, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_probe_selected(int))); + decoder_form->addRow(tr("%1 (%2) *") + .arg(p->name).arg(p->desc), combo); + + const ProbeSelector s = {combo, dec, p}; + _probe_selectors.push_back(s); + } + + // Add the optional probes + for(probe = decoder->opt_probes; probe; probe = probe->next) { + const struct srd_probe *const p = + (struct srd_probe *)probe->data; + QComboBox *const combo = create_probe_selector(parent, dec, p); + connect(combo, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_probe_selected(int))); + decoder_form->addRow(tr("%1 (%2)") + .arg(p->name).arg(p->desc), combo); + + const ProbeSelector s = {combo, dec, p}; + _probe_selectors.push_back(s); + } + + // Add the options + shared_ptr binding( + new prop::binding::DecoderOptions(_decoder_stack, dec)); + binding->add_properties_to_form(decoder_form, true); + + _bindings.push_back(binding); + + form->addRow(group); +} + QComboBox* DecodeTrace::create_probe_selector( - QWidget *parent, const srd_probe *const probe) + QWidget *parent, const shared_ptr &dec, + const srd_probe *const probe) { + assert(dec); + const vector< shared_ptr > sigs = _session.get_signals(); assert(_decoder_stack); const map >::const_iterator probe_iter = - _decoder_stack->probes().find(probe); + dec->probes().find(probe); QComboBox *selector = new QComboBox(parent); selector->addItem("-", qVariantFromValue((void*)NULL)); - if (probe_iter == _decoder_stack->probes().end()) + if (probe_iter == dec->probes().end()) selector->setCurrentIndex(0); for(size_t i = 0; i < sigs.size(); i++) { @@ -262,31 +378,41 @@ QComboBox* DecodeTrace::create_probe_selector( return selector; } -void DecodeTrace::commit_probes() +void DecodeTrace::commit_decoder_probes(shared_ptr &dec) { - assert(_decoder_stack); + assert(dec); map > probe_map; const vector< shared_ptr > sigs = _session.get_signals(); - for(map::const_iterator i = - _probe_selector_map.begin(); - i != _probe_selector_map.end(); i++) + BOOST_FOREACH(const ProbeSelector &s, _probe_selectors) { - const QComboBox *const combo = (*i).second; + if(s._decoder != dec) + break; + const LogicSignal *const selection = - (LogicSignal*)combo->itemData(combo->currentIndex()). - value(); + (LogicSignal*)s._combo->itemData( + s._combo->currentIndex()).value(); - BOOST_FOREACH(shared_ptr s, sigs) - if(s.get() == selection) { - probe_map[(*i).first] = - dynamic_pointer_cast(s); + BOOST_FOREACH(shared_ptr sig, sigs) + if(sig.get() == selection) { + probe_map[s._probe] = + dynamic_pointer_cast(sig); break; } } - _decoder_stack->set_probes(probe_map); + dec->set_probes(probe_map); +} + +void DecodeTrace::commit_probes() +{ + assert(_decoder_stack); + BOOST_FOREACH(shared_ptr dec, + _decoder_stack->stack()) + commit_decoder_probes(dec); + + _decoder_stack->begin_decode(); } void DecodeTrace::on_new_decode_data() @@ -310,5 +436,26 @@ void DecodeTrace::on_probe_selected(int) commit_probes(); } +void DecodeTrace::on_stack_decoder(srd_decoder *decoder) +{ + assert(decoder); + assert(_decoder_stack); + _decoder_stack->push(shared_ptr( + new data::decode::Decoder(decoder))); + _decoder_stack->begin_decode(); + + create_popup_form(); +} + +void DecodeTrace::on_delete_decoder(int index) +{ + _decoder_stack->remove(index); + + // Update the popup + create_popup_form(); + + _decoder_stack->begin_decode(); +} + } // namespace view } // namespace pv