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 24174794456d01ffb2fd05cbf27601cdc1e16334..528e0a033fb3aaec8d6477f1785edea050897328 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -35,7 +35,8 @@ using std::static_pointer_cast;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
@@ -87,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,
@@ -102,6 +106,9 @@ pair<int, int> TraceTreeItemOwner::v_extents() const
                        extents.second);
        }
 
+       if (!has_children)
+               extents = make_pair(0, 0);
+
        return extents;
 }
 
@@ -126,5 +133,6 @@ void TraceTreeItemOwner::restack_items()
 {
 }
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv