DecodeTrace: Speed up painting by not copying the annotations

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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 692a5f710a3f653adfa93c8ebe6ba95a4ccc7e6b..688a348f1092a0ea8d604459565008f9fb67d355 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 <QTimer>
 
 #include <pv/binding/decoder.hpp>

+#include <pv/data/decode/annotation.hpp>

 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 


@@ -50,14 +51,11 @@ namespace pv {
 class Session;
 
 namespace data {
 class Session;
 
 namespace data {

-class SignalBase;

 struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
 struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {

-class Annotation;

 class Decoder;
 class Decoder;

-class Row;

 }
 }  // namespace data
 
 }
 }  // namespace data
 


@@ -133,7 +131,8 @@ private:
                int h, const ViewItemPaintParams &pp, int y,
                QColor row_color, int row_title_width) const;
 
                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(int start, int 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,
                QPainter &p, int h, int y, QColor row_color) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,


@@ -204,7 +203,6 @@ private:
        shared_ptr<data::DecodeSignal> decode_signal_;
 
        vector<data::decode::Row> visible_rows_;
        shared_ptr<data::DecodeSignal> decode_signal_;
 
        vector<data::decode::Row> visible_rows_;

-       uint64_t decode_start_, decode_end_;

 
        map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
        map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID
 
        map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
        map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID