X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=31f4cb8331927133bca9073a34d16b24ac9fecbb;hp=93b966b4aad99517cb5e13b4e3f206968263e719;hb=83b1c8d251386ac1980284c4668cbdd8e425550f;hpb=4800cf9a4b346ec4553234aa1a3e10bf783bf965

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 93b966b4..31f4cb83 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -14,8 +14,7 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -24,38 +23,48 @@
 #include "tracetreeitemowner.hpp"
 #include "trace.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 {
+namespace views {
+namespace TraceView {
 
-vector< shared_ptr<TraceTreeItem> >& TraceTreeItemOwner::child_items()
+const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
 	return items_;
 }
 
-const vector< shared_ptr<TraceTreeItem> >& TraceTreeItemOwner::child_items() const
+vector< shared_ptr<TraceTreeItem> >
+TraceTreeItemOwner::trace_tree_child_items() const
 {
-	return items_;
+	vector< shared_ptr<TraceTreeItem> > items;
+	for (auto &i : items_) {
+		assert(dynamic_pointer_cast<TraceTreeItem>(i));
+		const shared_ptr<TraceTreeItem> t(
+			static_pointer_cast<TraceTreeItem>(i));
+		items.push_back(t);
+	}
+
+	return items;
 }
 
 void TraceTreeItemOwner::clear_child_items()
 {
-	for (auto &i : items_) {
-		assert(i->owner() == this);
-		i->set_owner(nullptr);
+	for (auto &t : trace_tree_child_items()) {
+		assert(t->owner() == this);
+		t->set_owner(nullptr);
 	}
 	items_.clear();
 }
 
-void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::add_child_item(shared_ptr<TraceTreeItem> item)
 {
 	assert(!item->owner());
 	item->set_owner(this);
@@ -64,60 +73,64 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
 	extents_changed(true, true);
 }
 
-void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr<TraceTreeItem> 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);
 
 	extents_changed(true, true);
 }
 
-TraceTreeItemOwner::iterator TraceTreeItemOwner::begin()
-{
-	return iterator(this, items_.begin());
-}
-
-TraceTreeItemOwner::iterator TraceTreeItemOwner::end()
-{
-	return iterator(this);
-}
-
-TraceTreeItemOwner::const_iterator TraceTreeItemOwner::begin() const
-{
-	return const_iterator(this, items_.cbegin());
-}
-
-TraceTreeItemOwner::const_iterator TraceTreeItemOwner::end() const
-{
-	return const_iterator(this);
-}
-
 pair<int, int> TraceTreeItemOwner::v_extents() const
 {
-	pair<int, int> extents(INT_MAX, INT_MIN);
+	bool has_children = false;
 
-	for (const shared_ptr<TraceTreeItem> r : child_items()) {
-		assert(r);
-		if (!r->enabled())
+	pair<int, int> extents(INT_MAX, INT_MIN);
+	for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
+		assert(t);
+		if (!t->enabled())
 			continue;
 
-		const int child_offset = r->layout_v_offset();
-		const pair<int, int> child_extents = r->v_extents();
+		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,
 			extents.first);
 		extents.second = max(child_extents.second + child_offset,
 			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