X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.hpp;h=cbb74427049af1db5b87eaeeb5d6ae0a31075a73;hp=c17769953e7dcd7eeb2005dc9ca2bc0e29e65255;hb=a8743cd962b2d18082c6ddaeb554d56013919d95;hpb=364d2155b342d3ef8f5f2c22be54bb35d0882b76

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index c1776995..cbb74427 100644
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.hpp
@@ -21,10 +21,8 @@
 #ifndef PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
 #define PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
 
-#include <memory>
-#include <vector>
-
-#include "rowitemiterator.hpp"
+#include "viewitemowner.hpp"
+#include "tracetreeitem.hpp"
 
 namespace pv {
 
@@ -35,24 +33,9 @@ namespace view {
 class TraceTreeItem;
 class View;
 
-class TraceTreeItemOwner
+class TraceTreeItemOwner : public ViewItemOwner
 {
 public:
-	typedef std::vector< std::shared_ptr<TraceTreeItem> > item_list;
-	typedef RowItemIterator<TraceTreeItemOwner, TraceTreeItem> iterator;
-	typedef RowItemIterator<const TraceTreeItemOwner, TraceTreeItem> const_iterator;
-
-public:
-	/**
-	 * Returns the session of the onwer.
-	 */
-	virtual pv::Session& session() = 0;
-
-	/**
-	 * Returns the session of the owner.
-	 */
-	virtual const pv::Session& session() const = 0;
-
 	/**
 	 * Returns the view of the owner.
 	 */
@@ -65,6 +48,16 @@ public:
 
 	virtual int owner_visual_v_offset() const = 0;
 
+	/**
+	 * Returns the session of the onwer.
+	 */
+	virtual pv::Session& session() = 0;
+
+	/**
+	 * Returns the session of the owner.
+	 */
+	virtual const pv::Session& session() const = 0;
+
 	/**
 	 * Returns the number of nested parents that this row item owner has.
 	 */
@@ -73,12 +66,13 @@ public:
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
-	virtual item_list& child_items();
+	virtual const item_list& child_items() const;
 
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
-	virtual const item_list& child_items() const;
+	std::vector< std::shared_ptr<TraceTreeItem> >
+	trace_tree_child_items() const;
 
 	/**
 	 * Clears the list of child items.
@@ -95,49 +89,7 @@ public:
 	 */
 	void remove_child_item(std::shared_ptr<TraceTreeItem> item);
 
-	/**
-	 * Returns a depth-first iterator at the beginning of the child TraceTreeItem
-	 * tree.
-	 */
-	iterator begin();
-
-	/**
-	 * Returns a depth-first iterator at the end of the child TraceTreeItem tree.
-	 */
-	iterator end();
-
-	/**
-	 * Returns a constant depth-first iterator at the beginning of the
-	 * child TraceTreeItem tree.
-	 */
-	const_iterator begin() const;
-
-	/**
-	 * Returns a constant depth-first iterator at the end of the child
-	 * TraceTreeItem tree.
-	 */
-	const_iterator end() const;
-
-	/**
-	 * Makes a list of row item owners of all the row items that are
-	 * decendants of this item.
-	 */
-	std::set< TraceTreeItemOwner* > list_row_item_owners();
-
-	/**
-	 * Creates a list of decendant signals filtered by type.
-	 */
-	template<class T>
-	std::vector< std::shared_ptr<T> > list_by_type() {
-		std::vector< std::shared_ptr<T> > items;
-		for (const auto &r : *this) {
-			std::shared_ptr<T> p = std::dynamic_pointer_cast<T>(r);
-			if (p)
-				items.push_back(p);
-		}
-
-		return items;
-	}
+	virtual void restack_items();
 
 	/**
 	 * Computes the vertical extents of the contents of this row item owner.
@@ -145,15 +97,10 @@ public:
 	 */
 	std::pair<int, int> v_extents() const;
 
-	virtual void restack_items();
-
 public:
 	virtual void row_item_appearance_changed(bool label, bool content) = 0;
 
 	virtual void extents_changed(bool horz, bool vert) = 0;
-
-private:
-	item_list items_;
 };
 
 } // view