Fix unit tests and prevent warnings

[pulseview.git] / pv / view / tracetreeitemowner.cpp

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index af11ad2688b8d6f61c670d5398fd60ed470a4cf0..24174794456d01ffb2fd05cbf27601cdc1e16334 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -37,12 +37,7 @@ using std::vector;
 namespace pv {
 namespace view {
 
-vector< shared_ptr<ViewItem> >& TraceTreeItemOwner::child_items()
-{
-       return items_;
-}
-
-const vector< shared_ptr<ViewItem> >& TraceTreeItemOwner::child_items() const
+const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
        return items_;
 }
@@ -110,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()
 {
 }