X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=1449d813dac5e808bef25ac18253cf08500b760f;hp=247e3e6def6d0241c485b7bdd0469cea86cb1d9d;hb=d9177e6cfafcbb3bdca8f8529e7c74f6a56d0a1a;hpb=af503b104d890a357c736c678bb00296d889c090

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 247e3e6d..1449d813 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -31,26 +31,36 @@ using std::min;
 using std::pair;
 using std::set;
 using std::shared_ptr;
+using std::static_pointer_cast;
 using std::vector;
 
 namespace pv {
 namespace view {
 
-vector< shared_ptr<TraceTreeItem> >& TraceTreeItemOwner::child_items()
+const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
 	return items_;
 }
 
-const vector< shared_ptr<TraceTreeItem> >& TraceTreeItemOwner::child_items() const
+vector< std::shared_ptr<TraceTreeItem> >
+TraceTreeItemOwner::trace_tree_child_items() const
 {
-	return items_;
+	vector< shared_ptr<TraceTreeItem> > items;
+	for (auto &i : items_) {
+		assert(dynamic_pointer_cast<TraceTreeItem>(i));
+		const shared_ptr<TraceTreeItem> t(
+			static_pointer_cast<TraceTreeItem>(i));
+		items.push_back(t);
+	}
+
+	return items;
 }
 
 void TraceTreeItemOwner::clear_child_items()
 {
-	for (auto &i : items_) {
-		assert(i->owner() == this);
-		i->set_owner(nullptr);
+	for (auto &t : trace_tree_child_items()) {
+		assert(t->owner() == this);
+		t->set_owner(nullptr);
 	}
 	items_.clear();
 }
@@ -75,67 +85,47 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
 	extents_changed(true, true);
 }
 
-TraceTreeItemOwner::iterator TraceTreeItemOwner::begin()
+pair<int, int> TraceTreeItemOwner::v_extents() const
 {
-	return iterator(this, items_.begin());
-}
+	bool has_children = false;
 
-TraceTreeItemOwner::iterator TraceTreeItemOwner::end()
-{
-	return iterator(this);
-}
+	pair<int, int> extents(INT_MAX, INT_MIN);
+	for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
+		assert(t);
+		if (!t->enabled())
+			continue;
 
-TraceTreeItemOwner::const_iterator TraceTreeItemOwner::begin() const
-{
-	return const_iterator(this, items_.cbegin());
-}
+		has_children = true;
 
-TraceTreeItemOwner::const_iterator TraceTreeItemOwner::end() const
-{
-	return const_iterator(this);
-}
-
-set< TraceTreeItemOwner* > TraceTreeItemOwner::list_row_item_owners()
-{
-	set< TraceTreeItemOwner* > owners;
-	for (const auto &r : *this)
-		owners.insert(r->owner());
-	return owners;
-}
-
-template<class T>
-set< shared_ptr<T> > TraceTreeItemOwner::list_by_type()
-{
-	set< shared_ptr<T> > items;
-	for (const auto &r : *this) {
-		shared_ptr<T> p = dynamic_pointer_cast<T>(r);
-		if (p)
-			items.insert(p);
+		const int child_offset = t->layout_v_offset();
+		const pair<int, int> child_extents = t->v_extents();
+		extents.first = min(child_extents.first + child_offset,
+			extents.first);
+		extents.second = max(child_extents.second + child_offset,
+			extents.second);
 	}
 
-	return items;
-}
+	if (!has_children)
+		extents = make_pair(0, 0);
 
-template set< shared_ptr<Trace> > TraceTreeItemOwner::list_by_type();
+	return extents;
+}
 
-pair<int, int> TraceTreeItemOwner::v_extents() const
+bool TraceTreeItemOwner::reassign_bgcolour_states(bool next_bgcolour_state)
 {
-	pair<int, int> extents(INT_MAX, INT_MIN);
+	vector< shared_ptr<TraceTreeItem> > items = trace_tree_child_items();
 
-	for (const shared_ptr<TraceTreeItem> r : child_items()) {
-		assert(r);
-		if (!r->enabled())
-			continue;
+	// Sort items according to vertical position
+	sort(items.begin(), items.end(),
+		[](const shared_ptr<TraceTreeItem> a, const shared_ptr<TraceTreeItem> b) {
+		return a->layout_v_offset() > b->layout_v_offset(); });
 
-		const int child_offset = r->layout_v_offset();
-		const pair<int, int> child_extents = r->v_extents();
-		extents.first = min(child_extents.first + child_offset,
-			extents.first);
-		extents.second = max(child_extents.second + child_offset,
-			extents.second);
+	for (const shared_ptr<TraceTreeItem> item : items) {
+		item->set_bgcolour_state(next_bgcolour_state);
+		next_bgcolour_state = !next_bgcolour_state;
 	}
 
-	return extents;
+	return next_bgcolour_state;
 }
 
 void TraceTreeItemOwner::restack_items()