projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Device: Make capability listing more robust
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 2ed43ba283b4f16c8f9c1a20a22e7138e2b3c63e..70282d290f8efef39ed4859e00234c829a9710ee 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-153,6
+153,12
@@
bool Viewport::touch_event(QTouchEvent *event)
void Viewport::paintEvent(QPaintEvent*)
{
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; }));
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; }));
@@
-168,23
+174,16
@@
void Viewport::paintEvent(QPaintEvent*)
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
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 (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<TimeItem> t : time_items)
- t->paint_mid(p, pp);
- for (const shared_ptr<RowItem> r : row_items)
- r->paint_mid(p, pp);
-
- for (const shared_ptr<RowItem> r : row_items)
- r->paint_fore(p, pp);
-
- 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();
}
p.end();
}
@@
-211,7
+210,7
@@
void Viewport::wheelEvent(QWheelEvent *event)
(event->delta() * height()) / (8 * 120));
} else {
// Vertical scrolling is interpreted as zooming in/out
(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
}
} else if (event->orientation() == Qt::Horizontal) {
// Horizontal scrolling is interpreted as moving left/right