DecodeTrace: Removed incorrect use of get_text_colour

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 5392b17e0fc815fa3f2b799424bca5c633a4d25f..94ef5f9a4a1364a9fac3c843cbb84173f3228031 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -212,8 +212,8 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
                        sample_range.first, sample_range.second);
                if (!annotations.empty()) {
                        for (const Annotation &a : annotations)
                        sample_range.first, sample_range.second);
                if (!annotations.empty()) {
                        for (const Annotation &a : annotations)

-                               draw_annotation(a, p, get_text_colour(),
-                                       annotation_height, pp, y, base_colour);
+                               draw_annotation(a, p, annotation_height,
+                                       pp, y, base_colour);

                        y += row_height_;
 
                        visible_rows_.push_back(rows[i]);
                        y += row_height_;
 
                        visible_rows_.push_back(rows[i]);


@@ -333,7 +333,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent)
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,

-       QPainter &p, QColor text_color, int h, const RowItemPaintParams &pp, int y,
+       QPainter &p, int h, const RowItemPaintParams &pp, int y,

        size_t base_colour) const
 {
        double samples_per_pixel, pixels_offset;
        size_t base_colour) const
 {
        double samples_per_pixel, pixels_offset;


@@ -353,15 +353,13 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
                return;
 
        if (a.start_sample() == a.end_sample())
                return;
 
        if (a.start_sample() == a.end_sample())

-               draw_instant(a, p, fill, outline, text_color, h,
-                       start, y);
+               draw_instant(a, p, fill, outline, h, start, y);

        else
        else

-               draw_range(a, p, fill, outline, text_color, h,
-                       start, end, y);
+               draw_range(a, p, fill, outline, h, start, end, y);

 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,

-       QColor fill, QColor outline, QColor text_color, int h, double x, int y) const
+       QColor fill, QColor outline, int h, double x, int y) const

 {
        const QString text = a.annotations().empty() ?
                QString() : a.annotations().back();
 {
        const QString text = a.annotations().empty() ?
                QString() : a.annotations().back();


@@ -373,12 +371,12 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
        p.setBrush(fill);
        p.drawRoundedRect(rect, h / 2, h / 2);
 
        p.setBrush(fill);
        p.drawRoundedRect(rect, h / 2, h / 2);
 

-       p.setPen(text_color);
+       p.setPen(Qt::black);

        p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
 }
 
 void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
        p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
 }
 
 void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,

-       QColor fill, QColor outline, QColor text_color, int h, double start,
+       QColor fill, QColor outline, int h, double start,

        double end, int y) const
 {
        const double top = y + .5 - h / 2;
        double end, int y) const
 {
        const double top = y + .5 - h / 2;


@@ -416,7 +414,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
        if (rect.width() <= 4)
                return;
 
        if (rect.width() <= 4)
                return;
 

-       p.setPen(text_color);
+       p.setPen(Qt::black);

 
        // Try to find an annotation that will fit
        QString best_annotation;
 
        // Try to find an annotation that will fit
        QString best_annotation;


@@ -453,7 +451,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
        p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
                Qt::AbsoluteSize);
 
        p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
                Qt::AbsoluteSize);
 

-       p.setPen(get_text_colour());
+       p.setPen(Qt::black);

        p.drawText(text_rect, message);
 }
 
        p.drawText(text_rect, message);
 }
 

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 71876f5ca418062160aa636067d0f1edce1dcbd6..c7013b514f6d232eb9a7636799b36f6141b7c3ae 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -125,15 +125,14 @@ public:
 
 private:
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
 
 private:
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,

-               QColor text_colour, int text_height, const RowItemPaintParams &pp, int y,
+               int text_height, const RowItemPaintParams &pp, int y,

                size_t base_colour) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                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,
-               int y) const;
+               QColor fill, QColor outline, int h, double x, int y) const;

 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,

-               QColor fill, QColor outline, QColor text_color, int h, double start,
+               QColor fill, QColor outline, int h, double start,

                double end, int y) const;
 
        void draw_error(QPainter &p, const QString &message,
                double end, int y) const;
 
        void draw_error(QPainter &p, const QString &message,