X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=3a61c31d8833448ea638114e20c1a5a79bd05516;hb=945238ca07e313568f1df5be1857f5f7db33d700;hp=9372f7af138f9e37b82a4f4b9880fda4063ff339;hpb=99ba5f2845a24f91901addb80c04d5bf0e0906f3;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 9372f7af..3a61c31d 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,10 +29,12 @@
 
 #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>
@@ -85,6 +87,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 +163,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,14 +172,16 @@ 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);
 
 	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;
 
@@ -183,10 +189,13 @@ 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();
 	void on_decode_finished();
+	void on_pause_decode();
 
 	void on_delete();
 
@@ -202,6 +211,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();
@@ -214,6 +225,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
@@ -223,6 +235,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_;