X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=c6b90a46ffd0a84ee099755e285a1ef26dfb6ab8;hb=8b787f41b6d33dafeb045a09c7690bbf895d483b;hp=6779712e689c681113f5f00d8fb369fa49eb4ac0;hpb=cf0a3c9c7a8763eeb4427e4fb6fe2c921ae38f09;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 6779712e..c6b90a46 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -34,12 +34,15 @@
 #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;
@@ -67,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
@@ -86,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;
@@ -165,7 +179,9 @@ private:
 	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);
 
@@ -176,16 +192,20 @@ private:
 		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:
 	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();
@@ -206,6 +226,8 @@ 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();
@@ -217,22 +239,23 @@ private:
 	pv::Session &session_;
 	shared_ptr<data::DecodeSignal> decode_signal_;
 
-	vector<data::decode::Row> visible_rows_;
+	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_;
 
-	data::decode::Row *selected_row_;
+	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_, visible_rows_, max_visible_rows_;
 
 	int min_useful_label_width_;
+	bool always_show_all_rows_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;