Removed SigSession from Trace

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 9f0e68b5deee5cd8fc0229f9182c2d526d4d11b4..08558c98091af6668dca55c992df1784ee51c595 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -39,13 +39,20 @@ class QComboBox;
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class DecoderStack;
 
 namespace decode {
 class Annotation;
 class Decoder;
+class Row;
+}
 }
+
+namespace widgets {
+class DecoderGroupBox;
 }
 
 namespace view {
@@ -70,7 +77,8 @@ private:
        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,
@@ -109,7 +117,7 @@ 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,
-               unsigned int row_index) const;
+               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,
@@ -149,7 +157,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;
@@ -158,8 +169,9 @@ private:
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;
+       std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
-       QSignalMapper _delete_mapper;
+       QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view