X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=af9151810100f1cf5eadea7dc3f58d60725d3bb5;hb=7352be721b90b630efd742b53e1a0ea16bb834b8;hp=5ec7ee7c5337bd1cdf929f70597c26fe9defa78c;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9;p=pulseview.git

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 5ec7ee7..af91518 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -26,6 +26,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <vector>
 
 #include <QSignalMapper>
 
@@ -124,16 +125,23 @@ public:
 	void delete_pressed();
 
 private:
+	void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
+		QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+		size_t base_colour);
+
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
 		int text_height, const ViewItemPaintParams &pp, int y,
 		size_t base_colour) const;
 
+	void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+		QPainter &p, int h, int y, size_t base_colour) const;
+
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
 		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, int h, double start,
-		double end, int y) const;
+		double end, int y, const ViewItemPaintParams &pp) const;
 
 	void draw_error(QPainter &p, const QString &message,
 		const ViewItemPaintParams &pp);
@@ -198,7 +206,7 @@ private:
 	std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
 	std::vector<data::decode::Row> visible_rows_;
-	int row_height_;
+	int row_height_, max_visible_rows_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };