X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=9e0faace5847294090f617b6ffbdd26f80200e9e;hp=229df86d3aaa6756ae20192603ace403ca386b34;hb=c294543f8df3b3c90fa613c8198506aea68e91e7;hpb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 229df86d..9e0faace 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -23,20 +23,36 @@
 
 #include "trace.h"
 
+#include <list>
 #include <map>
+#include <memory>
 
-#include <boost/shared_ptr.hpp>
+#include <QSignalMapper>
 
 #include <pv/prop/binding/decoderoptions.h>
+#include <pv/data/decode/row.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 {
@@ -45,18 +61,34 @@ class DecodeTrace : public Trace
 {
 	Q_OBJECT
 
+private:
+	struct ChannelSelector
+	{
+		const QComboBox *_combo;
+		const std::shared_ptr<pv::data::decode::Decoder> _decoder;
+		const srd_channel *_pdch;
+	};
+
 private:
 	static const QColor DecodeColours[4];
 	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);
 
@@ -76,6 +108,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);
@@ -83,29 +123,91 @@ 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, 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);
 
-	QComboBox* create_probe_selector(
-		QWidget *parent, const srd_probe *const probe);
+	void draw_unresolved_period(QPainter &p, int h, int left,
+		int right) const;
 
-	void commit_probes();
+	double get_pixels_offset() const;
 
-private slots:
+	double get_samples_per_pixel() const;
+
+	/**
+	 * Determines the start and end sample for a given pixel range.
+	 * @param x_start the X coordinate of the start sample in the view
+	 * @param x_end the X coordinate of the end sample in the view
+	 * @return Returns a pair containing the start sample and the end
+	 * 	sample that correspond to the start and end coordinates.
+	 */
+	std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
+
+	bool hover_point_is_over_trace();
+
+	int get_row_at_hover_point();
+
+	const QString get_annotation_at_hover_point();
+
+	void show_hover_annotation();
+
+	void hide_hover_annotation();
+
+	void hover_point_changed();
+
+	void create_decoder_form(int index,
+		std::shared_ptr<pv::data::decode::Decoder> &dec,
+		QWidget *parent, QFormLayout *form);
+
+	QComboBox* create_channel_selector(QWidget *parent,
+		const std::shared_ptr<pv::data::decode::Decoder> &dec,
+		const srd_channel *const pdch);
+
+	void commit_decoder_channels(
+		std::shared_ptr<data::decode::Decoder> &dec);
+
+	void commit_channels();
+
+private Q_SLOTS:
 	void on_new_decode_data();
 
 	void on_delete();
 
-	void on_probe_selected(int);
+	void on_channel_selected(int);
+
+	void on_stack_decoder(srd_decoder *decoder);
+
+	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;
 
-	pv::prop::binding::DecoderOptions _binding;
+	std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
+		_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;
 
-	std::map<const srd_probe*, QComboBox*> _probe_selector_map;
+	QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view