X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitemowner.h;h=4b25a580da685bf6bd8de62ff3d3167db72612bc;hp=4b538e6d664fa34f0dc7caf2afcf610e21635772;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hpb=68b21a71797051fb48ed272bc2a6b4893bdbf517

diff --git a/pv/view/rowitemowner.h b/pv/view/rowitemowner.h
index 4b538e6d..4b25a580 100644
--- a/pv/view/rowitemowner.h
+++ b/pv/view/rowitemowner.h
@@ -24,6 +24,8 @@
 #include <memory>
 #include <vector>
 
+#include "rowitemiterator.h"
+
 namespace pv {
 
 class SigSession;
@@ -35,6 +37,11 @@ class View;
 
 class RowItemOwner
 {
+public:
+	typedef std::vector< std::shared_ptr<RowItem> > item_list;
+	typedef RowItemIterator<RowItemOwner, RowItem> iterator;
+	typedef RowItemIterator<const RowItemOwner, RowItem> const_iterator;
+
 public:
 	/**
 	 * Returns the session of the onwer.
@@ -61,8 +68,12 @@ public:
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
-	virtual const std::vector< std::shared_ptr<RowItem> >&
-		child_items() const;
+	virtual item_list& child_items();
+
+	/**
+	 * Returns a list of row items owned by this object.
+	 */
+	virtual const item_list& child_items() const;
 
 	/**
 	 * Clears the list of child items.
@@ -79,10 +90,39 @@ public:
 	 */
 	void remove_child_item(std::shared_ptr<RowItem> item);
 
+	/**
+	 * Returns a depth-first iterator at the beginning of the child RowItem
+	 * tree.
+	 */
+	iterator begin();
+
+	/**
+	 * Returns a depth-first iterator at the end of the child RowItem tree.
+	 */
+	iterator end();
+
+	/**
+	 * Returns a constant depth-first iterator at the beginning of the
+	 * child RowItem tree.
+	 */
+	const_iterator begin() const;
+
+	/**
+	 * Returns a constant depth-first iterator at the end of the child
+	 * RowItem tree.
+	 */
+	const_iterator end() const;
+
+	/**
+	 * Computes the vertical extents of the contents of this row item owner.
+	 * @return A pair containing the minimum and maximum y-values.
+	 */
+	std::pair<int, int> v_extents() const;
+
 	virtual void update_viewport() = 0;
 
 private:
-	std::vector< std::shared_ptr<RowItem> > _items;
+	item_list _items;
 };
 
 } // view