Don't use Qt-defined keywords, they can cause problems with other headers.

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index bdcb4afe3ff1c350cd1002787ce942377e59e850..4b3bc3dec21ca6322cb4de879ebb01ffab020e75 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -25,26 +25,28 @@
 
 #include <list>
 #include <map>
+#include <memory>
 
 #include <QSignalMapper>
 
-#include <boost/shared_ptr.hpp>
-
 #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;
 }
 }
 
@@ -62,8 +64,8 @@ private:
        struct ProbeSelector
        {
                const QComboBox *_combo;
-               const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
-               const srd_probe *_probe;
+               const std::shared_ptr<pv::data::decode::Decoder> _decoder;
+               const srd_channel *_pdch;
        };
 
 private:
@@ -71,19 +73,21 @@ 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,
-               boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+               std::shared_ptr<pv::data::DecoderStack> decoder_stack,
                int index);
 
        bool enabled() const;
 
-       const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
+       const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
        void set_view(pv::view::View *view);
 
@@ -103,6 +107,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);
@@ -113,7 +125,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,
@@ -130,19 +142,19 @@ private:
                int right, double samples_per_pixel, double pixels_offset);
 
        void create_decoder_form(int index,
-               boost::shared_ptr<pv::data::decode::Decoder> &dec,
+               std::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);
+               const std::shared_ptr<pv::data::decode::Decoder> &dec,
+               const srd_channel *const pdch);
 
        void commit_decoder_probes(
-               boost::shared_ptr<data::decode::Decoder> &dec);
+               std::shared_ptr<data::decode::Decoder> &dec);
 
        void commit_probes();
 
-private slots:
+private Q_SLOTS:
        void on_new_decode_data();
 
        void on_delete();
@@ -156,16 +168,19 @@ private slots:
        void on_show_hide_decoder(int index);
 
 private:
-       boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+       pv::SigSession &_session;
+       std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
        uint64_t _decode_start, _decode_end;
 
-       std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+       std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;
        std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
+       std::vector<QString> _cur_row_headings;
+
        QSignalMapper _delete_mapper, _show_hide_mapper;
 };