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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 954ac90c..2705d3cf 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -77,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];
@@ -127,22 +128,21 @@ public:
 private:
 	void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
 		QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour);
+		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> a,
-		QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-		size_t base_colour) 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);
@@ -207,7 +207,10 @@ 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_;
+
+	int min_useful_label_width_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };