X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=258509e66ea4ec4869bda2a185e95454f73130d7;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=9877dc11ff63c7ece0c0cdc945ab5b3c31cb6335;hpb=adf9e02242336548a384c23dadc062af7a2ef83a;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 9877dc11..258509e6 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <QColor>
+#include <QComboBox>
 #include <QCheckBox>
 #include <QElapsedTimer>
 #include <QPolygon>
@@ -97,10 +98,12 @@ struct DecodeTraceRow {
 	ContainerWidget* container;
 	QWidget* header_container;
 	QWidget* selector_container;
+	QCheckBox* row_visibility_checkbox;
 	vector<QCheckBox*> selectors;
 
 	QColor row_color;
 	map<uint32_t, QColor> ann_class_color;
+	map<uint32_t, QColor> ann_class_dark_color;
 };
 
 class ContainerWidget : public QWidget
@@ -124,6 +127,7 @@ private:
 	static const QColor ErrorBgColor;
 	static const QColor NoDecodeColor;
 	static const QColor ExpandMarkerWarnColor;
+	static const QColor ExpandMarkerHiddenColor;
 	static const uint8_t ExpansionAreaHeaderAlpha;
 	static const uint8_t ExpansionAreaAlpha;
 
@@ -133,7 +137,8 @@ private:
 	static const int DrawPadding;
 
 	static const int MaxTraceUpdateRate;
-	static const unsigned int AnimationDurationInTicks;
+	static const int AnimationDurationInTicks;
+	static const int HiddenRowHideDelay;
 
 public:
 	DecodeTrace(pv::Session &session, shared_ptr<SignalBase> signalbase,
@@ -145,6 +150,12 @@ public:
 
 	shared_ptr<SignalBase> base() const;
 
+	/**
+	 * Sets the owner this trace in the view trace hierachy.
+	 * @param The new owner of the trace.
+	 */
+	virtual void set_owner(TraceTreeItemOwner *owner);
+
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -185,7 +196,7 @@ public:
 	virtual void mouse_left_press_event(const QMouseEvent* event);
 
 private:
-	void draw_annotations(vector<const Annotation*> annotations, QPainter &p,
+	void draw_annotations(deque<const Annotation*>& annotations, QPainter &p,
 		const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row);
 
 	void draw_annotation(const Annotation* a, QPainter &p,
@@ -233,7 +244,7 @@ private:
 	QComboBox* create_channel_selector_init_state(QWidget *parent,
 		const data::decode::DecodeChannel *ch);
 
-	void export_annotations(vector<const Annotation*> *annotations) const;
+	void export_annotations(deque<const Annotation*>& annotations) const;
 
 	void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id);
 	void update_rows();
@@ -274,6 +285,8 @@ private Q_SLOTS:
 	void on_show_hide_decoder(int index);
 	void on_show_hide_row(int row_id);
 	void on_show_hide_class(QWidget* sender);
+	void on_show_all_classes();
+	void on_hide_all_classes();
 	void on_row_container_resized(QWidget* sender);
 
 	void on_copy_annotation_to_clipboard();
@@ -286,6 +299,7 @@ private Q_SLOTS:
 	void on_export_all_rows_from_here();
 
 	void on_animation_timer();
+	void on_hide_hidden_rows();
 
 private:
 	pv::Session &session_;
@@ -305,15 +319,15 @@ private:
 	QPushButton* stack_button_;
 
 	unsigned int default_row_height_, annotation_height_;
-	unsigned int visible_rows_, max_visible_rows_;
+	unsigned int visible_rows_;
 
 	int min_useful_label_width_;
-	bool always_show_all_rows_;
+	bool always_show_all_rows_, show_hidden_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_, animation_timer_, delayed_hidden_row_hider_;
 
 	QPolygon default_marker_shape_;