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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index e3d8d68c..954ac90c 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,18 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
 
 #include "trace.hpp"
 
 #include <list>
 #include <map>
 #include <memory>
+#include <vector>
 
 #include <QSignalMapper>
 
-#include <pv/prop/binding/decoderoptions.hpp>
+#include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -99,26 +100,23 @@ public:
 	/**
 	 * Paints the background layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal.
-	 * @param right the x-coordinate of the right edge of the signal.
-	 **/
-	void paint_back(QPainter &p, int left, int right);
+	 * @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 left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 **/
-	void paint_mid(QPainter &p, int left, int right);
+	 * @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 left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 **/
-	void paint_fore(QPainter &p, int left, int right);
+	 * @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);
 
@@ -127,20 +125,27 @@ 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,
-		QColor text_colour, int text_height, int left, int right, int y,
+		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, QColor text_color, int h, double x,
-		int y) const;
+		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, QColor text_color, int h, double start,
+		QColor fill, QColor outline, int h, double start,
 		double end, int y) const;
 
 	void draw_error(QPainter &p, const QString &message,
-		int left, int right);
+		const ViewItemPaintParams &pp);
 
 	void draw_unresolved_period(QPainter &p, int h, int left,
 		int right) const;
@@ -160,8 +165,6 @@ private:
 
 	const QString get_annotation_at_point(const QPoint &point);
 
-	void hide_hover_annotation();
-
 	void create_decoder_form(int index,
 		std::shared_ptr<pv::data::decode::Decoder> &dec,
 		QWidget *parent, QFormLayout *form);
@@ -197,14 +200,14 @@ private:
 
 	uint64_t decode_start_, decode_end_;
 
-	std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
+	std::list< std::shared_ptr<pv::binding::Decoder> >
 		bindings_;
 
 	std::list<ChannelSelector> channel_selectors_;
 	std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
 	std::vector<data::decode::Row> visible_rows_;
-	int text_height_, row_height_;
+	int row_height_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };
@@ -212,4 +215,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP