Improved row annotation colouring

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index c12d5b51314cc5b4c53cb9f05e51bbb28cd198b1..9f0e68b5deee5cd8fc0229f9182c2d526d4d11b4 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -26,11 +26,14 @@
 #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;
 
@@ -40,6 +43,7 @@ namespace data {
 class DecoderStack;
 
 namespace decode {
+class Annotation;
 class Decoder;
 }
 }
@@ -61,6 +65,12 @@ private:
 private:
        static const QColor DecodeColours[4];
        static const QColor ErrorBgColour;
+       static const QColor NoDecodeColour;
+
+       static const double EndCapWidth;
+       static const int DrawPadding;
+
+       static const QColor Colours[7];
 
 public:
        DecodeTrace(pv::SigSession &session,
@@ -96,10 +106,26 @@ public:
        void delete_pressed();
 
 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;
+
+       void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
+               QColor fill, QColor outline, QColor text_color, int h, double x,
+               int y) const;
+
+       void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
+               QColor fill, QColor outline, QColor text_color, int h, double start,
+               double end, int y) const;
+
        void draw_error(QPainter &p, const QString &message,
                int left, int right);
 
-       void create_decoder_form(
+       void draw_unresolved_period(QPainter &p, int h, int left,
+               int right, double samples_per_pixel, double pixels_offset);
+
+       void create_decoder_form(int index,
                boost::shared_ptr<pv::data::decode::Decoder> &dec,
                QWidget *parent, QFormLayout *form);
 
@@ -121,6 +147,8 @@ private slots:
 
        void on_stack_decoder(srd_decoder *decoder);
 
+       void on_delete_decoder(int index);
+
 private:
        boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
@@ -130,6 +158,8 @@ private:
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;
+
+       QSignalMapper _delete_mapper;
 };
 
 } // namespace view