X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=4b3bc3dec21ca6322cb4de879ebb01ffab020e75;hp=02ea023bf87e5f6f697a3c9958846099b80605e3;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hpb=5dfeb70fc60f1c4752697d8ad6f80e1415213197

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 02ea023b..4b3bc3de 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -25,28 +25,35 @@
 
 #include <list>
 #include <map>
+#include <memory>
 
 #include <QSignalMapper>
 
-#include <boost/shared_ptr.hpp>
-
 #include <pv/prop/binding/decoderoptions.h>
 
-struct srd_probe;
+struct srd_channel;
 struct srd_decoder;
 
 class QComboBox;
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class DecoderStack;
 
 namespace decode {
+class Annotation;
 class Decoder;
+class Row;
 }
 }
 
+namespace widgets {
+class DecoderGroupBox;
+}
+
 namespace view {
 
 class DecodeTrace : public Trace
@@ -57,8 +64,8 @@ private:
 	struct ProbeSelector
 	{
 		const QComboBox *_combo;
-		const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
-		const srd_probe *_probe;
+		const std::shared_ptr<pv::data::decode::Decoder> _decoder;
+		const srd_channel *_pdch;
 	};
 
 private:
@@ -66,14 +73,21 @@ private:
 	static const QColor ErrorBgColour;
 	static const QColor NoDecodeColour;
 
+	static const int ArrowSize;
+	static const double EndCapWidth;
+	static const int DrawPadding;
+
+	static const QColor Colours[16];
+	static const QColor OutlineColours[16];
+
 public:
 	DecodeTrace(pv::SigSession &session,
-		boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+		std::shared_ptr<pv::data::DecoderStack> decoder_stack,
 		int index);
 
 	bool enabled() const;
 
-	const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
+	const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
 	void set_view(pv::view::View *view);
 
@@ -93,6 +107,14 @@ public:
 	 **/
 	void paint_mid(QPainter &p, int left, int right);
 
+	/**
+	 * 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);
+
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 	QMenu* create_context_menu(QWidget *parent);
@@ -100,6 +122,19 @@ public:
 	void delete_pressed();
 
 private:
+	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
+		QColor text_colour, int text_height, int left, int right,
+		double samples_per_pixel, double pixels_offset, 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;
+
+	void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
+		QColor fill, QColor outline, QColor text_color, int h, double start,
+		double end, int y) const;
+
 	void draw_error(QPainter &p, const QString &message,
 		int left, int right);
 
@@ -107,19 +142,19 @@ private:
 		int right, double samples_per_pixel, double pixels_offset);
 
 	void create_decoder_form(int index,
-		boost::shared_ptr<pv::data::decode::Decoder> &dec,
+		std::shared_ptr<pv::data::decode::Decoder> &dec,
 		QWidget *parent, QFormLayout *form);
 
 	QComboBox* create_probe_selector(QWidget *parent,
-		const boost::shared_ptr<pv::data::decode::Decoder> &dec,
-		const srd_probe *const probe);
+		const std::shared_ptr<pv::data::decode::Decoder> &dec,
+		const srd_channel *const pdch);
 
 	void commit_decoder_probes(
-		boost::shared_ptr<data::decode::Decoder> &dec);
+		std::shared_ptr<data::decode::Decoder> &dec);
 
 	void commit_probes();
 
-private slots:
+private Q_SLOTS:
 	void on_new_decode_data();
 
 	void on_delete();
@@ -130,17 +165,23 @@ private slots:
 
 	void on_delete_decoder(int index);
 
+	void on_show_hide_decoder(int index);
+
 private:
-	boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+	pv::SigSession &_session;
+	std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
 	uint64_t _decode_start, _decode_end;
 
-	std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+	std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
 		_bindings;
 
 	std::list<ProbeSelector> _probe_selectors;
+	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
+
+	std::vector<QString> _cur_row_headings;
 
-	QSignalMapper _delete_mapper;
+	QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view