X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitemowner.cpp;h=ba2e1f4838ab44874b831b7ad06d9b79c12dd70c;hp=d6150f89a90e5db497bf6f2eae4e5a09e7b69e80;hb=873cbed09a23679f39e955478d6c70429104ce40;hpb=68b21a71797051fb48ed272bc2a6b4893bdbf517

diff --git a/pv/view/rowitemowner.cpp b/pv/view/rowitemowner.cpp
index d6150f89..ba2e1f48 100644
--- a/pv/view/rowitemowner.cpp
+++ b/pv/view/rowitemowner.cpp
@@ -20,43 +20,109 @@
 
 #include <cassert>
 
-#include "rowitem.h"
-#include "rowitemowner.h"
+#include "rowitem.hpp"
+#include "rowitemowner.hpp"
 
+using std::max;
+using std::make_pair;
+using std::min;
+using std::pair;
+using std::set;
 using std::shared_ptr;
 using std::vector;
 
 namespace pv {
 namespace view {
 
+vector< shared_ptr<RowItem> >& RowItemOwner::child_items()
+{
+	return items_;
+}
+
 const vector< shared_ptr<RowItem> >& RowItemOwner::child_items() const
 {
-	return _items;
+	return items_;
 }
 
 void RowItemOwner::clear_child_items()
 {
-	for (auto &i : _items) {
+	for (auto &i : items_) {
 		assert(i->owner() == this);
 		i->set_owner(nullptr);
 	}
-	_items.clear();
+	items_.clear();
 }
 
 void RowItemOwner::add_child_item(std::shared_ptr<RowItem> item)
 {
 	assert(!item->owner());
 	item->set_owner(this);
-	_items.push_back(item);
+	items_.push_back(item);
+
+	extents_changed(true, true);
 }
 
 void RowItemOwner::remove_child_item(std::shared_ptr<RowItem> item)
 {
 	assert(item->owner() == this);
 	item->set_owner(nullptr);
-	auto iter = std::find(_items.begin(), _items.end(), item);
-	assert(iter != _items.end());
-	_items.erase(iter);
+	auto iter = std::find(items_.begin(), items_.end(), item);
+	assert(iter != items_.end());
+	items_.erase(iter);
+
+	extents_changed(true, true);
+}
+
+RowItemOwner::iterator RowItemOwner::begin()
+{
+	return iterator(this, items_.begin());
+}
+
+RowItemOwner::iterator RowItemOwner::end()
+{
+	return iterator(this);
+}
+
+RowItemOwner::const_iterator RowItemOwner::begin() const
+{
+	return const_iterator(this, items_.cbegin());
+}
+
+RowItemOwner::const_iterator RowItemOwner::end() const
+{
+	return const_iterator(this);
+}
+
+set< RowItemOwner* > RowItemOwner::list_row_item_owners()
+{
+	set< RowItemOwner* > owners;
+	for (const auto &r : *this)
+		owners.insert(r->owner());
+	return owners;
+}
+
+pair<int, int> RowItemOwner::v_extents() const
+{
+	pair<int, int> extents(INT_MAX, INT_MIN);
+
+	for (const shared_ptr<RowItem> r : child_items()) {
+		assert(r);
+		if (!r->enabled())
+			continue;
+
+		const int child_offset = r->layout_v_offset();
+		const pair<int, int> child_extents = r->v_extents();
+		extents.first = min(child_extents.first + child_offset,
+			extents.first);
+		extents.second = max(child_extents.second + child_offset,
+			extents.second);
+	}
+
+	return extents;
+}
+
+void RowItemOwner::restack_items()
+{
 }
 
 } // view