Added decoder stack item deletion

[pulseview.git] / pv / view / decodetrace.cpp

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index d3d10b6981953eaf02651a572c30d4f53e89cec9..bad849c04665b2c53680836f610fdd329bc8ccd8 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -41,6 +41,7 @@ extern "C" {
 #include <pv/view/logicsignal.h>
 #include <pv/view/view.h>
 #include <pv/view/decode/annotation.h>
+#include <pv/widgets/decodergroupbox.h>
 #include <pv/widgets/decodermenu.h>
 
 using namespace boost;
@@ -61,7 +62,8 @@ const QColor DecodeTrace::ErrorBgColour = QColor(0xEF, 0x29, 0x29);
 DecodeTrace::DecodeTrace(pv::SigSession &session,
        boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
        Trace(session, QString(decoder_stack->stack().front()->decoder()->name)),
-       _decoder_stack(decoder_stack)
+       _decoder_stack(decoder_stack),
+       _delete_mapper(this)
 {
        assert(_decoder_stack);
 
@@ -69,6 +71,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
@@ -130,6 +134,8 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
+       using pv::data::decode::Decoder;
+
        assert(form);
        assert(parent);
        assert(_decoder_stack);
@@ -141,9 +147,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
        _bindings.clear();
        _probe_selectors.clear();
 
-       BOOST_FOREACH(shared_ptr<data::decode::Decoder> dec,
-               _decoder_stack->stack())
-               create_decoder_form(dec, parent, form);
+       const list< shared_ptr<Decoder> >& stack = _decoder_stack->stack();
+       list< shared_ptr<Decoder> >::const_iterator iter = stack.begin();
+       for (int i = 0; i < (int)stack.size(); i++, iter++) {
+               shared_ptr<Decoder> dec(*iter);
+               create_decoder_form(i, dec, parent, form);
+       }
 
        form->addRow(new QLabel(
                tr("<i>* Required Probes</i>"), parent));
@@ -198,8 +207,9 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
        p.drawText(text_rect, message);
 }
 
-void DecodeTrace::create_decoder_form(shared_ptr<data::decode::Decoder> &dec,
-       QWidget *parent, QFormLayout *form)
+void DecodeTrace::create_decoder_form(int index,
+       shared_ptr<data::decode::Decoder> &dec, QWidget *parent,
+       QFormLayout *form)
 {
        const GSList *probe;
 
@@ -207,7 +217,14 @@ void DecodeTrace::create_decoder_form(shared_ptr<data::decode::Decoder> &dec,
        const srd_decoder *const decoder = dec->decoder();
        assert(decoder);
 
-       form->addRow(new QLabel(tr("<h3>%1</h3>").arg(decoder->name), parent));
+       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) {
@@ -216,7 +233,7 @@ void DecodeTrace::create_decoder_form(shared_ptr<data::decode::Decoder> &dec,
                QComboBox *const combo = create_probe_selector(parent, dec, p);
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
-               form->addRow(tr("<b>%1</b> (%2) *")
+               decoder_form->addRow(tr("<b>%1</b> (%2) *")
                        .arg(p->name).arg(p->desc), combo);
 
                const ProbeSelector s = {combo, dec, p};
@@ -230,7 +247,7 @@ void DecodeTrace::create_decoder_form(shared_ptr<data::decode::Decoder> &dec,
                QComboBox *const combo = create_probe_selector(parent, dec, p);
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
-               form->addRow(tr("<b>%1</b> (%2)")
+               decoder_form->addRow(tr("<b>%1</b> (%2)")
                        .arg(p->name).arg(p->desc), combo);
 
                const ProbeSelector s = {combo, dec, p};
@@ -240,9 +257,11 @@ void DecodeTrace::create_decoder_form(shared_ptr<data::decode::Decoder> &dec,
        // Add the options
        shared_ptr<prop::binding::DecoderOptions> binding(
                new prop::binding::DecoderOptions(_decoder_stack, dec));
-       binding->add_properties_to_form(form, true);
+       binding->add_properties_to_form(decoder_form, true);
 
        _bindings.push_back(binding);
+
+       form->addRow(group);
 }
 
 QComboBox* DecodeTrace::create_probe_selector(
@@ -350,5 +369,15 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
        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