X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=70282d290f8efef39ed4859e00234c829a9710ee;hb=3592f4053b1b9d96869ccfb88a09a1d493ee253f;hp=d3f25aa6ba2bb82e07aa0afd1a389f6a13f9c6f9;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index d3f25aa..70282d2 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -17,9 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
@@ -59,8 +59,7 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
-		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(pp).contains(pt))
+		if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
@@ -154,6 +153,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
+	typedef void (ViewItem::*LayerPaintFunc)(
+		QPainter &p, ViewItemPaintParams &pp);
+	LayerPaintFunc layer_paint_funcs[] = {
+		&ViewItem::paint_back, &ViewItem::paint_mid,
+		&ViewItem::paint_fore, nullptr};
+
 	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; }));
@@ -169,24 +174,16 @@ void Viewport::paintEvent(QPaintEvent*)
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_back(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_back(p, pp);
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_mid(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_mid(p, pp);
+	for (LayerPaintFunc *paint_func = layer_paint_funcs;
+			*paint_func; paint_func++) {
+		ViewItemPaintParams time_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<TimeItem> t : time_items)
+			(t.get()->*(*paint_func))(p, time_pp);
 
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_fore(p, pp);
-
-	p.setRenderHint(QPainter::Antialiasing, false);
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_fore(p, pp);
+		ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<RowItem> r : row_items)
+			(r.get()->*(*paint_func))(p, row_pp);
+	}
 
 	p.end();
 }
@@ -213,7 +210,7 @@ void Viewport::wheelEvent(QWheelEvent *event)
 				(event->delta() * height()) / (8 * 120));
 		} else {
 			// Vertical scrolling is interpreted as zooming in/out
-			view_.zoom(event->delta() / 120, event->x());
+			view_.zoom(event->delta() / 120.0, event->x());
 		}
 	} else if (event->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right