X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=70282d290f8efef39ed4859e00234c829a9710ee;hb=d8d053b6e51abf651ca31d0d4822035c06fb7f9b;hp=4b5fe245e0c11a9c6af77fdd038201d4427e997e;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 4b5fe24..70282d2 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -17,9 +17,9 @@
* along with this program; if not, see .
*/
+#include
#include
#include
-#include
#include
#include "signal.hpp"
@@ -153,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 > row_items(view_.list_by_type());
assert(none_of(row_items.begin(), row_items.end(),
[](const shared_ptr &r) { return !r; }));
@@ -168,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 t : time_items)
- t->paint_back(p, pp);
- for (const shared_ptr r : row_items)
- r->paint_back(p, pp);
-
- for (const shared_ptr t : time_items)
- t->paint_mid(p, pp);
- for (const shared_ptr 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 t : time_items)
+ (t.get()->*(*paint_func))(p, time_pp);
- for (const shared_ptr r : row_items)
- r->paint_fore(p, pp);
-
- p.setRenderHint(QPainter::Antialiasing, false);
- for (const shared_ptr t : time_items)
- t->paint_fore(p, pp);
+ ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
+ for (const shared_ptr r : row_items)
+ (r.get()->*(*paint_func))(p, row_pp);
+ }
p.end();
}
@@ -212,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