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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 49168522..b5da2dc2 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>
 
@@ -76,6 +77,7 @@ private:
 
 	static const int ArrowSize;
 	static const double EndCapWidth;
+	static const int RowTitleMargin;
 	static const int DrawPadding;
 
 	static const QColor Colours[16];
@@ -100,21 +102,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,16 +126,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, int row_title_width);
+
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		int text_height, const ViewItemPaintParams &pp, int y,
-		size_t base_colour) const;
+		int h, const ViewItemPaintParams &pp, int y,
+		size_t base_colour, int row_title_width) const;
+
+	void draw_annotation_block(std::vector<pv::data::decode::Annotation> annotations,
+		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;
+		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;
+		int h, double start, double end, int y, const ViewItemPaintParams &pp,
+		int row_title_width) const;
 
 	void draw_error(QPainter &p, const QString &message,
 		const ViewItemPaintParams &pp);
@@ -198,7 +207,8 @@ private:
 	std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
 	std::vector<data::decode::Row> visible_rows_;
-	int row_height_;
+	std::map<data::decode::Row, int> row_title_widths_;
+	int row_height_, max_visible_rows_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };