X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=91b27d3ffb02ab383c3d2c801507191610a072e6;hb=e94f43c6539a9ec9412829550d8f025902ccc341;hp=a4b6680a7fe57bd02ed6b5b2e59888266a4d2552;hpb=32c589f0f6a2218e81d4ee984335c4a88c79b35f;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a4b6680..91b27d3 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -95,7 +95,10 @@ void Viewport::drag_release()
 
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
-	vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+	vector< shared_ptr<ViewItem> > items;
+	const std::vector< shared_ptr<ViewItem> > view_items(
+		view_.list_by_type<ViewItem>());
+	copy(view_items.begin(), view_items.end(), back_inserter(items));
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	copy(time_items.begin(), time_items.end(), back_inserter(items));
 	return items;
@@ -148,13 +151,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
 	assert(none_of(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &r) { return !r; }));
 
 	stable_sort(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-			return a->visual_v_offset() < b->visual_v_offset(); });
+			return a->point(QRect()).y() < b->point(QRect()).y(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	assert(none_of(time_items.begin(), time_items.end(),