X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=24174794456d01ffb2fd05cbf27601cdc1e16334;hp=a33a8597538be87bc1a748833c67bfd7eb8cdea0;hb=5d6ae8a26c8d86531d0d85d2fefc67d617c73f56;hpb=a7dafb5c5f6ba13cf3aaa63ca491f0100e3b1153

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index a33a8597..24174794 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,45 +85,17 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
 	extents_changed(true, true);
 }
 
-TraceTreeItemOwner::iterator TraceTreeItemOwner::begin()
-{
-	return iterator(this, items_.begin());
-}
-
-TraceTreeItemOwner::iterator TraceTreeItemOwner::end()
-{
-	return iterator(this);
-}
-
-TraceTreeItemOwner::const_iterator TraceTreeItemOwner::begin() const
-{
-	return const_iterator(this, items_.cbegin());
-}
-
-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;
-}
-
 pair<int, int> TraceTreeItemOwner::v_extents() const
 {
 	pair<int, int> extents(INT_MAX, INT_MIN);
 
-	for (const shared_ptr<TraceTreeItem> r : child_items()) {
-		assert(r);
-		if (!r->enabled())
+	for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
+		assert(t);
+		if (!t->enabled())
 			continue;
 
-		const int child_offset = r->layout_v_offset();
-		const pair<int, int> child_extents = r->v_extents();
+		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,
@@ -123,6 +105,23 @@ pair<int, int> TraceTreeItemOwner::v_extents() const
 	return extents;
 }
 
+bool TraceTreeItemOwner::reassign_bgcolour_states(bool next_bgcolour_state)
+{
+	vector< shared_ptr<TraceTreeItem> > items = trace_tree_child_items();
+
+	// 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(); });
+
+	for (const shared_ptr<TraceTreeItem> item : items) {
+		item->set_bgcolour_state(next_bgcolour_state);
+		next_bgcolour_state = !next_bgcolour_state;
+	}
+
+	return next_bgcolour_state;
+}
+
 void TraceTreeItemOwner::restack_items()
 {
 }