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

diff --git a/pv/view/view.h b/pv/view/view.h
index 2f746297..8664ba8d 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
@@ -97,7 +98,7 @@ 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.
@@ -152,6 +153,8 @@ public:
 
 	void update_viewport();
 
+	void restack_all_row_items();
+
 Q_SIGNALS:
 	void hover_point_changed();
 
@@ -193,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);