Fix #979 by querying trigger types only once and storing them

[pulseview.git] / pv / views / trace / decodetrace.hpp

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 00fe7f424cc5a12bcaf2bdc78a2a0dc7a689f23c..55c3f3b5c47a80edbdff1e4dfab92e723cfda3a8 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -33,6 +33,7 @@
 #include <QTimer>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
@@ -130,14 +131,15 @@ private:
                int h, const ViewItemPaintParams &pp, int y,
                QColor row_color, int row_title_width) const;
 
-       void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+       void draw_annotation_block(qreal start, qreal end,
+               pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
                QPainter &p, int h, int y, QColor row_color) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double x, int y) const;
+               int h, qreal x, int y) const;
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double start, double end, int y, const ViewItemPaintParams &pp,
+               int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
                int row_title_width) const;
 
        void draw_error(QPainter &p, const QString &message,