X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=79f7a27d23b948bebf3c231de8df04c5042bfdd0;hp=a65f707872bda76265faf56d73a306bdc9bb6193;hb=74bf66669012692f7eda790abe724bd5bb4ae8c6;hpb=c764c995115fbcd3668a02ce1ce0950b5fb6c670;ds=sidebyside

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index a65f7078..79f7a27d 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,17 +29,21 @@
 
 #include <QColor>
 #include <QComboBox>
+#include <QPolygon>
 #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;
@@ -67,6 +71,18 @@ 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, expanded_height, title_width, animation_step;
+	bool exists, currently_visible;
+	bool expand_marker_highlighted, expanding, expanded, collapsing;
+	QPolygon expand_marker_shape;
+	float anim_height, anim_shape;
+};
+
 class DecodeTrace : public Trace
 {
 	Q_OBJECT
@@ -81,11 +97,14 @@ private:
 	static const int DrawPadding;
 
 	static const int MaxTraceUpdateRate;
+	static const unsigned int AnimationDurationInTicks;
 
 public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
 		int index);
 
+	~DecodeTrace();
+
 	bool enabled() const;
 
 	shared_ptr<data::SignalBase> base() const;
@@ -123,7 +142,11 @@ public:
 
 	virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
 
-	void delete_pressed();
+	virtual void delete_pressed();
+
+	virtual void hover_point_changed(const QPoint &hp);
+
+	virtual void mouse_left_press_event(const QMouseEvent* event);
 
 private:
 	void draw_annotations(vector<pv::data::decode::Annotation> annotations,
@@ -165,7 +188,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 +201,17 @@ 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;
 
-public:
-	virtual void hover_point_changed(const QPoint &hp);
+	void update_rows();
 
 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();
@@ -215,30 +241,36 @@ private Q_SLOTS:
 	void on_export_row_from_here();
 	void on_export_all_rows_from_here();
 
+	void on_animation_timer();
+
 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_, 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_;
 
-	QTimer delayed_trace_updater_;
+	QTimer delayed_trace_updater_, animation_timer_;
+
+	QPolygon default_marker_shape_;
 };
 
 } // namespace trace