Added decoder stack item deletion

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 6f7182f4ebd618f583cc6972b4f8d38b191218cb..ccf4a0f7bbe4d64d9c421b3eb25c446fc0e67934 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -23,21 +23,29 @@
 
 #include "trace.h"
 
+#include <list>
 #include <map>
 
+#include <QSignalMapper>
+
 #include <boost/shared_ptr.hpp>
 
 #include <pv/prop/binding/decoderoptions.h>
 
 struct srd_probe;
+struct srd_decoder;
 
 class QComboBox;
 
 namespace pv {
 
 namespace data {
+class DecoderStack;
+
+namespace decode {
 class Decoder;
 }
+}
 
 namespace view {
 
@@ -45,17 +53,26 @@ class DecodeTrace : public Trace
 {
        Q_OBJECT
 
+private:
+       struct ProbeSelector
+       {
+               const QComboBox *_combo;
+               const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+               const srd_probe *_probe;
+       };
+
 private:
        static const QColor DecodeColours[4];
        static const QColor ErrorBgColour;
 
 public:
        DecodeTrace(pv::SigSession &session,
-               boost::shared_ptr<pv::data::Decoder> decoder, int index);
+               boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+               int index);
 
        bool enabled() const;
 
-       const boost::shared_ptr<pv::data::Decoder>& decoder() const;
+       const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
        void set_view(pv::view::View *view);
 
@@ -85,8 +102,16 @@ private:
        void draw_error(QPainter &p, const QString &message,
                int left, int right);
 
-       QComboBox* create_probe_selector(
-               QWidget *parent, const srd_probe *const probe);
+       void create_decoder_form(int index,
+               boost::shared_ptr<pv::data::decode::Decoder> &dec,
+               QWidget *parent, QFormLayout *form);
+
+       QComboBox* create_probe_selector(QWidget *parent,
+               const boost::shared_ptr<pv::data::decode::Decoder> &dec,
+               const srd_probe *const probe);
+
+       void commit_decoder_probes(
+               boost::shared_ptr<data::decode::Decoder> &dec);
 
        void commit_probes();
 
@@ -97,14 +122,21 @@ private slots:
 
        void on_probe_selected(int);
 
+       void on_stack_decoder(srd_decoder *decoder);
+
+       void on_delete_decoder(int index);
+
 private:
-       boost::shared_ptr<pv::data::Decoder> _decoder;
+       boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
        uint64_t _decode_start, _decode_end;
 
-       pv::prop::binding::DecoderOptions _binding;
+       std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+               _bindings;
+
+       std::list<ProbeSelector> _probe_selectors;
 
-       std::map<const srd_probe*, QComboBox*> _probe_selector_map;
+       QSignalMapper _delete_mapper;
 };
 
 } // namespace view