X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=8664ba8de28a368257b88836b09a69559f9a2066;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hp=9f66fc9630590caf4eee92107cba7a268cabd87f;hpb=5c47d6c11c336a963c0251b55313bab3fababcaa;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 9f66fc96..8664ba8d 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -25,10 +25,12 @@
 
 #include <memory>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
+#include <QTimer>
 
 #include <pv/data/signaldata.h>
 
@@ -49,6 +51,12 @@ class Viewport;
 class View : public QAbstractScrollArea, public RowItemOwner {
 	Q_OBJECT
 
+private:
+	enum StickyEvents {
+		SelectableItemHExtentsChanged = 1,
+		SelectableItemVExtentsChanged = 2
+	};
+
 private:
 	static const double MaxScale;
 	static const double MinScale;
@@ -56,9 +64,6 @@ private:
 	static const int MaxScrollValue;
 
 public:
-	static const int SignalHeight;
-	static const int SignalMargin;
-
 	static const QColor CursorAreaColour;
 
 	static const QSizeF LabelPadding;
@@ -93,7 +98,12 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
-	int owner_v_offset() const;
+	int owner_visual_v_offset() const;
+
+	/**
+	 * Returns the number of nested parents that this row item owner has.
+	 */
+	unsigned int depth() const;
 
 	void zoom(double steps);
 	void zoom(double steps, int offset);
@@ -141,10 +151,10 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void normalize_layout();
-
 	void update_viewport();
 
+	void restack_all_row_items();
+
 Q_SIGNALS:
 	void hover_point_changed();
 
@@ -186,6 +196,17 @@ private:
 	 */
 	QRectF label_rect(int right);
 
+	static bool add_channels_to_owner(
+		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
+		RowItemOwner *owner, int &offset,
+		std::unordered_map<std::shared_ptr<sigrok::Channel>,
+			std::shared_ptr<Signal> > &signal_map,
+		std::function<bool (std::shared_ptr<RowItem>)> filter_func =
+			std::function<bool (std::shared_ptr<RowItem>)>());
+
+	static void apply_offset(
+		std::shared_ptr<RowItem> row_item, int &offset);
+
 private:
 	bool eventFilter(QObject *object, QEvent *event);
 
@@ -193,6 +214,11 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 
+public:
+	void appearance_changed(bool label, bool content);
+
+	void extents_changed(bool horz, bool vert);
+
 private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
@@ -205,7 +231,7 @@ private Q_SLOTS:
 
 	void on_signals_moved();
 
-	void on_geometry_updated();
+	void process_sticky_events();
 
 	void on_hover_point_changed();
 
@@ -230,6 +256,9 @@ private:
 	CursorPair _cursors;
 
 	QPoint _hover_point;
+
+	unsigned int _sticky_events;
+	QTimer _lazy_event_handler;
 };
 
 } // namespace view