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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 75bea06c..d7fddbc2 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -28,7 +28,8 @@
 #include <vector>
 
 #include <QColor>
-#include <QComboBox>
+#include <QCheckBox>
+#include <QPolygon>
 #include <QPushButton>
 #include <QSignalMapper>
 #include <QTimer>
@@ -47,6 +48,8 @@ using std::pair;
 using std::shared_ptr;
 using std::vector;
 
+using pv::data::decode::Row;
+
 struct srd_channel;
 struct srd_decoder;
 
@@ -60,6 +63,7 @@ class DecodeSignal;
 
 namespace decode {
 class Decoder;
+class Row;
 }
 }  // namespace data
 
@@ -70,13 +74,21 @@ class DecoderGroupBox;
 namespace views {
 namespace trace {
 
-struct RowData {
+struct DecodeTraceRow {
 	// 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;
+	Row* decode_row;
+	unsigned int height, expanded_height, title_width, animation_step;
+	bool exists, currently_visible, has_hidden_classes;
+	bool expand_marker_highlighted, expanding, expanded, collapsing;
+	QPolygon expand_marker_shape;
+	float anim_height, anim_shape;
+
+	QWidget* container;
+	QWidget* header_container;
+	QWidget* selector_container;
+	vector<QCheckBox*> selectors;
 };
 
 class DecodeTrace : public Trace
@@ -86,6 +98,9 @@ class DecodeTrace : public Trace
 private:
 	static const QColor ErrorBgColor;
 	static const QColor NoDecodeColor;
+	static const QColor ExpandMarkerWarnColor;
+	static const uint8_t ExpansionAreaHeaderAlpha;
+	static const uint8_t ExpansionAreaAlpha;
 
 	static const int ArrowSize;
 	static const double EndCapWidth;
@@ -93,6 +108,7 @@ private:
 	static const int DrawPadding;
 
 	static const int MaxTraceUpdateRate;
+	static const unsigned int AnimationDurationInTicks;
 
 public:
 	DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
@@ -137,7 +153,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,
@@ -179,9 +199,9 @@ private:
 	QColor get_row_color(int row_index) const;
 	QColor get_annotation_color(QColor row_color, int annotation_index) const;
 
-	unsigned int get_row_y(const RowData* row) const;
+	unsigned int get_row_y(const DecodeTraceRow* row) const;
 
-	RowData* get_row_at_point(const QPoint &point);
+	DecodeTraceRow* get_row_at_point(const QPoint &point);
 
 	const QString get_annotation_at_point(const QPoint &point);
 
@@ -198,10 +218,20 @@ private:
 
 	void export_annotations(vector<data::decode::Annotation> *annotations) const;
 
+	void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id);
 	void update_rows();
 
-public:
-	virtual void hover_point_changed(const QPoint &hp);
+	/**
+	 * Sets row r to expanded state without forcing an update of the view
+	 */
+	void set_row_expanded(DecodeTraceRow* r);
+
+	/**
+	 * Sets row r to collapsed state without forcing an update of the view
+	 */
+	void set_row_collapsed(DecodeTraceRow* r);
+
+	void update_expanded_rows();
 
 private Q_SLOTS:
 	void on_setting_changed(const QString &key, const QVariant &value);
@@ -225,6 +255,8 @@ private Q_SLOTS:
 	void on_delete_decoder(int index);
 
 	void on_show_hide_decoder(int index);
+	void on_show_hide_row(int row_id);
+	void on_show_hide_class(QWidget* sender);
 
 	void on_copy_annotation_to_clipboard();
 
@@ -235,18 +267,20 @@ 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_;
 
-	deque<RowData> rows_;
+	deque<DecodeTraceRow> 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_;
+	const Row* selected_row_;
 	pair<uint64_t, uint64_t> selected_sample_range_;
 
 	vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
@@ -259,8 +293,11 @@ private:
 	bool always_show_all_rows_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
+	QSignalMapper row_show_hide_mapper_, class_show_hide_mapper_;
+
+	QTimer delayed_trace_updater_, animation_timer_;
 
-	QTimer delayed_trace_updater_;
+	QPolygon default_marker_shape_;
 };
 
 } // namespace trace