X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=75bea06cdd81668582d6953007953e2c37d60c61;hp=692a5f710a3f653adfa93c8ebe6ba95a4ccc7e6b;hb=9741d6e0ef768fc9f9fddd458803423c733b2305;hpb=9ba13f5e933f55f015e7c592980dfad14b4c66a8

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 692a5f71..75bea06c 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,15 +29,20 @@
 
 #include <QColor>
 #include <QComboBox>
+#include <QPushButton>
 #include <QSignalMapper>
 #include <QTimer>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
+using std::deque;
 using std::list;
 using std::map;
+using std::mutex;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -50,14 +55,11 @@ namespace pv {
 class Session;
 
 namespace data {
-class SignalBase;
 struct DecodeChannel;
 class DecodeSignal;
 
 namespace decode {
-class Annotation;
 class Decoder;
-class Row;
 }
 }  // namespace data
 
@@ -68,6 +70,15 @@ class DecoderGroupBox;
 namespace views {
 namespace trace {
 
+struct RowData {
+	// When adding a field, make sure it's initialized properly in
+	// DecodeTrace::update_rows()
+
+	data::decode::Row decode_row;
+	unsigned int height, title_width;
+	bool exists, currently_visible, expand_marker_highlighted, expanded;
+};
+
 class DecodeTrace : public Trace
 {
 	Q_OBJECT
@@ -87,6 +98,8 @@ public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
 		int index);
 
+	~DecodeTrace();
+
 	bool enabled() const;
 
 	shared_ptr<data::SignalBase> base() const;
@@ -120,7 +133,9 @@ public:
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-	QMenu* create_context_menu(QWidget *parent);
+	QMenu* create_header_context_menu(QWidget *parent);
+
+	virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
 
 	void delete_pressed();
 
@@ -133,14 +148,15 @@ private:
 		int h, const ViewItemPaintParams &pp, int y,
 		QColor row_color, int row_title_width) const;
 
-	void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+	void draw_annotation_block(qreal start, qreal end,
+		pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
 		QPainter &p, int h, int y, QColor row_color) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-		int h, double x, int y) const;
+		int h, qreal x, int y) const;
 
 	void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-		int h, double start, double end, int y, const ViewItemPaintParams &pp,
+		int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
 		int row_title_width) const;
 
 	void draw_error(QPainter &p, const QString &message,
@@ -158,32 +174,43 @@ private:
 	 * @return Returns a pair containing the start sample and the end
 	 * 	sample that correspond to the start and end coordinates.
 	 */
-	pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
+	pair<uint64_t, uint64_t> get_view_sample_range(int x_start, int x_end) const;
 
 	QColor get_row_color(int row_index) const;
 	QColor get_annotation_color(QColor row_color, int annotation_index) const;
 
-	int get_row_at_point(const QPoint &point);
+	unsigned int get_row_y(const RowData* row) const;
+
+	RowData* get_row_at_point(const QPoint &point);
 
 	const QString get_annotation_at_point(const QPoint &point);
 
+	void update_stack_button();
+
 	void create_decoder_form(int index,
 		shared_ptr<pv::data::decode::Decoder> &dec,
 		QWidget *parent, QFormLayout *form);
 
 	QComboBox* create_channel_selector(QWidget *parent,
-		const data::DecodeChannel *ch);
+		const data::decode::DecodeChannel *ch);
 	QComboBox* create_channel_selector_init_state(QWidget *parent,
-		const data::DecodeChannel *ch);
+		const data::decode::DecodeChannel *ch);
+
+	void export_annotations(vector<data::decode::Annotation> *annotations) const;
+
+	void update_rows();
 
 public:
-	void hover_point_changed(const QPoint &hp);
+	virtual void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
+	void on_setting_changed(const QString &key, const QVariant &value);
+
 	void on_new_annotations();
 	void on_delayed_trace_update();
 	void on_decode_reset();
 	void on_decode_finished();
+	void on_pause_decode();
 
 	void on_delete();
 
@@ -199,23 +226,37 @@ private Q_SLOTS:
 
 	void on_show_hide_decoder(int index);
 
+	void on_copy_annotation_to_clipboard();
+
+	void on_export_row();
+	void on_export_all_rows();
+	void on_export_row_with_cursor();
+	void on_export_all_rows_with_cursor();
+	void on_export_row_from_here();
+	void on_export_all_rows_from_here();
+
 private:
 	pv::Session &session_;
 	shared_ptr<data::DecodeSignal> decode_signal_;
 
-	vector<data::decode::Row> visible_rows_;
-	uint64_t decode_start_, decode_end_;
+	deque<RowData> rows_;
+	mutable mutex row_modification_mutex_;
 
 	map<QComboBox*, uint16_t> channel_id_map_;  // channel selector -> decode channel ID
 	map<QComboBox*, uint16_t> init_state_map_;  // init state selector -> decode channel ID
 	list< shared_ptr<pv::binding::Decoder> > bindings_;
 
+	const data::decode::Row* selected_row_;
+	pair<uint64_t, uint64_t> selected_sample_range_;
+
 	vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
+	QPushButton* stack_button_;
 
-	map<data::decode::Row, int> row_title_widths_;
-	int row_height_, max_visible_rows_;
+	unsigned int default_row_height_, annotation_height_;
+	unsigned int visible_rows_, max_visible_rows_;
 
 	int min_useful_label_width_;
+	bool always_show_all_rows_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;