X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=80c9cf750b341f155fe1a6b077fe60dca6339b5a;hb=f6a93932056dab5e2f75207b65197b436d4141a5;hp=8d651d037dc3e824d930c1802b54f79bedb360c1;hpb=5a9146acd1a3ec81ff74e108f50d5b2885ff21a1;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 8d651d03..80c9cf75 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
 
 #include <config.h>
 #include "trace.hpp"
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <QColor>
+#include <QComboBox>
 #include <QCheckBox>
 #include <QElapsedTimer>
 #include <QPolygon>
@@ -81,6 +82,8 @@ class DecoderGroupBox;
 namespace views {
 namespace trace {
 
+class ContainerWidget;
+
 struct DecodeTraceRow {
 	// When adding a field, make sure it's initialized properly in
 	// DecodeTrace::update_rows()
@@ -92,20 +95,34 @@ struct DecodeTraceRow {
 	QPolygon expand_marker_shape;
 	float anim_height, anim_shape;
 
-	QWidget* container;
+	ContainerWidget* container;
 	QWidget* header_container;
 	QWidget* selector_container;
+	QCheckBox* row_visibility_checkbox;
 	vector<QCheckBox*> selectors;
 };
 
+class ContainerWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	ContainerWidget(QWidget *parent = nullptr);
+
+	virtual void resizeEvent(QResizeEvent* event);
+
+Q_SIGNALS:
+	void widgetResized(QWidget* sender);
+};
+
 class DecodeTrace : public Trace
 {
 	Q_OBJECT
 
 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;
 
@@ -115,7 +132,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,
@@ -127,6 +145,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.
@@ -167,25 +191,23 @@ public:
 	virtual void mouse_left_press_event(const QMouseEvent* event);
 
 private:
-	void draw_annotations(vector<const Annotation*> annotations, QPainter &p,
-		int h, const ViewItemPaintParams &pp, int y, QColor row_color,
-		int row_title_width);
+	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, int h,
-		const ViewItemPaintParams &pp, int y, QColor row_color,
-		int row_title_width) const;
+	void draw_annotation(const Annotation* a, QPainter &p,
+		const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const;
 
-	void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class,
-		bool use_ann_format, QPainter &p, int h, int y, QColor row_color) const;
+	void draw_annotation_block(qreal start, qreal end, uint32_t ann_class,
+		bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const;
 
-	void draw_instant(const Annotation* a, QPainter &p, int h, qreal x, int y) const;
+	void draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const;
 
-	void draw_range(const Annotation* a, QPainter &p, int h, qreal start, qreal end,
+	void draw_range(const Annotation* a, QPainter &p, qreal start, qreal end,
 		int y, const ViewItemPaintParams &pp, int row_title_width) const;
 
 	void draw_error(QPainter &p, const QString &message, const ViewItemPaintParams &pp);
 
-	void draw_unresolved_period(QPainter &p, int h, int left, int right) const;
+	void draw_unresolved_period(QPainter &p, int left, int right) const;
 
 	pair<double, double> get_pixels_offset_samples_per_pixel() const;
 
@@ -198,9 +220,6 @@ private:
 	 */
 	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;
-
 	unsigned int get_row_y(const DecodeTraceRow* row) const;
 
 	DecodeTraceRow* get_row_at_point(const QPoint &point);
@@ -217,7 +236,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();
@@ -237,6 +256,8 @@ private:
 private Q_SLOTS:
 	void on_setting_changed(const QString &key, const QVariant &value);
 
+	void on_color_changed(const QColor &color);
+
 	void on_new_annotations();
 	void on_delayed_trace_update();
 	void on_decode_reset();
@@ -258,6 +279,9 @@ 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();
 
@@ -269,6 +293,7 @@ private Q_SLOTS:
 	void on_export_all_rows_from_here();
 
 	void on_animation_timer();
+	void on_hide_hidden_rows();
 
 private:
 	pv::Session &session_;
@@ -288,15 +313,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_;
 
@@ -309,4 +334,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP