Rename 'probe' to 'channel' (libsigrokdecode change).

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 2df848acbba38110c95d4018b9d48be33ceddf8a..9a991fcb436c63596fb3c2d3cedd9fff4b7a3aa3 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -32,20 +32,27 @@
 
 #include <pv/prop/binding/decoderoptions.h>
 
-struct srd_probe;
+struct srd_channel;
 struct srd_decoder;
 
 class QComboBox;
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class DecoderStack;
 
 namespace decode {
 class Annotation;
 class Decoder;
+class Row;
+}
 }
+
+namespace widgets {
+class DecoderGroupBox;
 }
 
 namespace view {
@@ -59,7 +66,7 @@ private:
        {
                const QComboBox *_combo;
                const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
-               const srd_probe *_probe;
+               const srd_channel *_pdch;
        };
 
 private:
@@ -67,10 +74,12 @@ private:
        static const QColor ErrorBgColour;
        static const QColor NoDecodeColour;
 
+       static const int ArrowSize;
        static const double EndCapWidth;
        static const int DrawPadding;
 
-       static const QColor Colours[7];
+       static const QColor Colours[16];
+       static const QColor OutlineColours[16];
 
 public:
        DecodeTrace(pv::SigSession &session,
@@ -99,6 +108,14 @@ public:
         **/
        void paint_mid(QPainter &p, int left, int right);
 
+       /**
+        * Paints the foreground layer of the trace with a QPainter
+        * @param p the QPainter to paint into.
+        * @param left the x-coordinate of the left edge of the signal
+        * @param right the x-coordinate of the right edge of the signal
+        **/
+       void paint_fore(QPainter &p, int left, int right);
+
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
        QMenu* create_context_menu(QWidget *parent);
@@ -108,7 +125,8 @@ public:
 private:
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
                QColor text_colour, int text_height, int left, int right,
-               double samples_per_pixel, double pixels_offset, int y) const;
+               double samples_per_pixel, double pixels_offset, int y,
+               size_t base_colour) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, QColor text_color, int h, double x,
@@ -130,7 +148,7 @@ private:
 
        QComboBox* create_probe_selector(QWidget *parent,
                const boost::shared_ptr<pv::data::decode::Decoder> &dec,
-               const srd_probe *const probe);
+               const srd_channel *const pdch);
 
        void commit_decoder_probes(
                boost::shared_ptr<data::decode::Decoder> &dec);
@@ -148,7 +166,10 @@ private slots:
 
        void on_delete_decoder(int index);
 
+       void on_show_hide_decoder(int index);
+
 private:
+       pv::SigSession &_session;
        boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
        uint64_t _decode_start, _decode_end;
@@ -157,8 +178,11 @@ private:
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;
+       std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
+
+       std::vector<QString> _cur_row_headings;
 
-       QSignalMapper _delete_mapper;
+       QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view