ViewPort: Make ViewItemPaintParams mutable

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index d3f25aa6ba2bb82e07aa0afd1a389f6a13f9c6f9..a179cef1c6ca572609e12ad10ad3ad2de2eef59e 100644 (file)
--- 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();
 }