Moved decoder config into the popup

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

diff --git a/pv/view/decodesignal.h b/pv/view/decodesignal.h
index 22e0f3d07c02b31bd6b4bf75da4e212eb31b7a79..7977c1c3ab40cd25497a548888d8958bc1b80de5 100644 (file)
--- a/pv/view/decodesignal.h
+++ b/pv/view/decodesignal.h
@@ -18,13 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DECODESIGNAL_H
-#define PULSEVIEW_PV_DECODESIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_DECODESIGNAL_H
+#define PULSEVIEW_PV_VIEW_DECODESIGNAL_H
 
 #include "trace.h"
 
+#include <map>
+
 #include <boost/shared_ptr.hpp>
 
+#include <pv/prop/binding/decoderoptions.h>
+
+struct srd_probe;
+
+class QComboBox;
+
 namespace pv {
 
 namespace data {
@@ -39,6 +47,7 @@ class DecodeSignal : public Trace
 
 private:
        static const QColor DecodeColours[4];
+       static const QColor ErrorBgColour;
 
 public:
        DecodeSignal(pv::SigSession &session,
@@ -46,6 +55,8 @@ public:
 
        bool enabled() const;
 
+       const boost::shared_ptr<pv::data::Decoder>& decoder() const;
+
        void set_view(pv::view::View *view);
 
        /**
@@ -64,28 +75,39 @@ public:
         **/
        void paint_mid(QPainter &p, int left, int right);
 
+       void populate_popup_form(QWidget *parent, QFormLayout *form);
+
        QMenu* create_context_menu(QWidget *parent);
 
+       void delete_pressed();
+
 private:
+       void draw_error(QPainter &p, const QString &message,
+               int left, int right);
 
-       /**
-        * When painting into the rectangle, calculate the y
-        * offset of the zero point.
-        **/
-       int get_nominal_offset(const QRect &rect) const;
+       QComboBox* create_probe_selector(
+               QWidget *parent, const srd_probe *const probe);
+
+       void commit_probes();
 
 private slots:
        void on_new_decode_data();
 
        void on_delete();
 
+       void on_probe_selected(int);
+
 private:
        boost::shared_ptr<pv::data::Decoder> _decoder;
 
        uint64_t _decode_start, _decode_end;
+
+       pv::prop::binding::DecoderOptions _binding;
+
+       std::map<const srd_probe*, QComboBox*> _probe_selector_map;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DECODESIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_DECODESIGNAL_H