X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=c7013b514f6d232eb9a7636799b36f6141b7c3ae;hp=e3d8d68c04feb45e50c8780f8f480dfa45b001b1;hb=2a56e4485a97c1d3e679325ec5413039d7a0c06c;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp index e3d8d68c..c7013b51 100644 --- a/pv/view/decodetrace.hpp +++ b/pv/view/decodetrace.hpp @@ -99,26 +99,23 @@ public: /** * Paints the background 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. + * @param pp the painting parameters object to paint with.. **/ - void paint_back(QPainter &p, int left, int right); + void paint_back(QPainter &p, const RowItemPaintParams &pp); /** * Paints the mid-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 + * @param pp the painting parameters object to paint with. **/ - void paint_mid(QPainter &p, int left, int right); + void paint_mid(QPainter &p, const RowItemPaintParams &pp); /** * 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 + * @param pp the painting parameters object to paint with. **/ - void paint_fore(QPainter &p, int left, int right); + void paint_fore(QPainter &p, const RowItemPaintParams &pp); void populate_popup_form(QWidget *parent, QFormLayout *form); @@ -128,19 +125,18 @@ public: private: void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, - QColor text_colour, int text_height, int left, int right, 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, - 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, - 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, - int left, int right); + const RowItemPaintParams &pp); void draw_unresolved_period(QPainter &p, int h, int left, int right) const;