X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=bff63c762135e2b402941a856118b7097cc77079;hb=ad21e6c1a85b991c0363232baf18ba7edbe2e31a;hp=af11ad2688b8d6f61c670d5398fd60ed470a4cf0;hpb=c373f82810ad9c5376a7370118de9dd587ee0e43;p=pulseview.git
diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index af11ad2..bff63c7 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -14,40 +14,34 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
#include "tracetreeitem.hpp"
-#include "tracetreeitemowner.hpp"
#include "trace.hpp"
+#include "tracetreeitemowner.hpp"
-using std::dynamic_pointer_cast;
-using std::max;
+using std::find;
using std::make_pair;
+using std::max;
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 >& TraceTreeItemOwner::child_items()
-{
- return items_;
-}
+namespace views {
+namespace TraceView {
-const vector< shared_ptr >& TraceTreeItemOwner::child_items() const
+const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
{
return items_;
}
-vector< std::shared_ptr >
+vector< shared_ptr >
TraceTreeItemOwner::trace_tree_child_items() const
{
vector< shared_ptr > items;
@@ -70,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items()
items_.clear();
}
-void TraceTreeItemOwner::add_child_item(std::shared_ptr item)
+void TraceTreeItemOwner::add_child_item(shared_ptr item)
{
assert(!item->owner());
item->set_owner(this);
@@ -79,11 +73,11 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr item)
extents_changed(true, true);
}
-void TraceTreeItemOwner::remove_child_item(std::shared_ptr item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr item)
{
assert(item->owner() == this);
item->set_owner(nullptr);
- auto iter = std::find(items_.begin(), items_.end(), item);
+ auto iter = find(items_.begin(), items_.end(), item);
assert(iter != items_.end());
items_.erase(iter);
@@ -92,13 +86,16 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr item)
pair TraceTreeItemOwner::v_extents() const
{
- pair extents(INT_MAX, INT_MIN);
+ bool has_children = false;
+ pair extents(INT_MAX, INT_MIN);
for (const shared_ptr t : trace_tree_child_items()) {
assert(t);
if (!t->enabled())
continue;
+ has_children = true;
+
const int child_offset = t->layout_v_offset();
const pair child_extents = t->v_extents();
extents.first = min(child_extents.first + child_offset,
@@ -107,6 +104,9 @@ pair TraceTreeItemOwner::v_extents() const
extents.second);
}
+ if (!has_children)
+ extents = make_pair(0, 0);
+
return extents;
}
@@ -114,5 +114,6 @@ void TraceTreeItemOwner::restack_items()
{
}
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv