X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6d366e7311881b8736b80daf2709becd72d7c88b;hb=6d84894ef7395c5ec689e0fa72f396c3c2b6e53a;hp=c0b3e251d964c5266d500db962ac2ebbc764b188;hpb=364d2155b342d3ef8f5f2c22be54bb35d0882b76;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c0b3e25..6d366e7 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -32,6 +32,8 @@
 #include <mutex>
 #include <unordered_set>
 
+#include <boost/thread/locks.hpp>
+
 #include <QApplication>
 #include <QEvent>
 #include <QFontMetrics>
@@ -507,7 +509,11 @@ void View::update_viewport()
 void View::restack_all_trace_tree_items()
 {
 	// Make a list of owners that is sorted from deepest first
-	const auto owners = list_row_item_owners();
+	const vector<shared_ptr<TraceTreeItem>> items(
+		list_by_type<TraceTreeItem>());
+	set< TraceTreeItemOwner* > owners;
+	for (const auto &r : items)
+		owners.insert(r->owner());
 	vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
 	sort(sorted_owners.begin(), sorted_owners.end(),
 		[](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {
@@ -518,8 +524,8 @@ void View::restack_all_trace_tree_items()
 		o->restack_items();
 
 	// Animate the items to their destination
-	for (const auto &r : *this)
-		r->animate_to_layout_v_offset();
+	for (const auto &i : items)
+		i->animate_to_layout_v_offset();
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -1059,7 +1065,9 @@ void View::process_sticky_events()
 
 void View::on_hover_point_changed()
 {
-	for (shared_ptr<TraceTreeItem> r : *this)
+	const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+		list_by_type<TraceTreeItem>());
+	for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 		r->hover_point_changed();
 }