Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index af11ad2688b8d6f61c670d5398fd60ed470a4cf0..528e0a033fb3aaec8d6477f1785edea050897328 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -35,14 +35,10 @@ using std::static_pointer_cast;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-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_;
 }
@@ -92,13 +88,16 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
 
 pair<int, int> TraceTreeItemOwner::v_extents() const
 {
-       pair<int, int> extents(INT_MAX, INT_MIN);
+       bool has_children = false;
 
+       pair<int, int> extents(INT_MAX, INT_MIN);
        for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
                assert(t);
                if (!t->enabled())
                        continue;
 
+               has_children = true;
+
                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,
@@ -107,12 +106,33 @@ pair<int, int> TraceTreeItemOwner::v_extents() const
                        extents.second);
        }
 
+       if (!has_children)
+               extents = make_pair(0, 0);
+
        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()
 {
 }
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv