X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=b74524c56e5b90b860fee83356e9dc21a208a330;hb=2bdc5796c866b9494b2c40051e973e4385d9c46f;hp=57e462203f1fc60ca9a8c01da58414185021e466;hpb=556259d2d0a212c20db9b18311b9524b52401a56;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 57e46220..b74524c5 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,6 +29,7 @@
 
 #include <QColor>
 #include <QComboBox>
+#include <QPushButton>
 #include <QSignalMapper>
 #include <QTimer>
 
@@ -85,6 +86,8 @@ public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
 		int index);
 
+	~DecodeTrace();
+
 	bool enabled() const;
 
 	shared_ptr<data::SignalBase> base() const;
@@ -159,7 +162,7 @@ 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;
@@ -168,6 +171,8 @@ private:
 
 	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);
@@ -183,6 +188,8 @@ 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();
@@ -203,6 +210,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();
@@ -215,6 +224,7 @@ private:
 	shared_ptr<data::DecodeSignal> decode_signal_;
 
 	vector<data::decode::Row> visible_rows_;
+	bool always_show_all_rows_;
 
 	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
@@ -224,6 +234,7 @@ private:
 	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_;