X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=954ac90ca420e84c8bd596a95607fbaf960995c9;hp=49168522d23c07c29e69978e8fca39e3ff3fb102;hb=506317984393a41000650ccca868f3dd66872a4f;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 49168522..954ac90c 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>
 
@@ -100,21 +101,21 @@ public:
 	 * Paints the background layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
-	 **/
+	 */
 	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -124,10 +125,18 @@ 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, const ViewItemPaintParams &pp, 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;