viewport: Allow smoother zoom using vertical scroll events

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2d10f2a054fadb31dc47783d3395460c54fb2c0a..70282d290f8efef39ed4859e00234c829a9710ee 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"
@@ -37,10 +37,7 @@ using std::abs;
 using std::back_inserter;
 using std::copy;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+using std::none_of; // Used in assert()s.
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
@@ -62,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;
 }
@@ -157,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; }));
@@ -172,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();
 }
@@ -216,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