X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=eb011e74367df36951046beb5c582a8dd06ef8c1;hp=92544ae2b424b3490b323d7eb032ea6e0a20d64e;hb=f74015db20c1ac85df6397df7199a030e6db828f;hpb=3370799041d0ee09bf1c7c4f006933778579c037

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 92544ae2..eb011e74 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,21 +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;
+		size_t base_colour, int row_title_width) 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;
+		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);
@@ -206,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_;
 };