Viewport: Anti-alias time items, but not row items

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a4b6680a7fe57bd02ed6b5b2e59888266a4d2552..ac494272de8705522a6c1ca43e073dbd3f9d23d0 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -57,10 +57,11 @@ Viewport::Viewport(View &parent) :
 
 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(rect()).contains(pt))
+                       (*i)->hit_box_rect(pp).contains(pt))
                        return *i;
        return nullptr;
 }
@@ -95,7 +96,10 @@ void Viewport::drag_release()
 
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
-       vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+       vector< shared_ptr<ViewItem> > items;
+       const std::vector< shared_ptr<ViewItem> > view_items(
+               view_.list_by_type<ViewItem>());
+       copy(view_items.begin(), view_items.end(), back_inserter(items));
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
        copy(time_items.begin(), time_items.end(), back_inserter(items));
        return items;
@@ -148,13 +152,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-       vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+       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; }));
 
        stable_sort(row_items.begin(), row_items.end(),
                [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-                       return a->visual_v_offset() < b->visual_v_offset(); });
+                       return a->point(QRect()).y() < b->point(QRect()).y(); });
 
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
        assert(none_of(time_items.begin(), time_items.end(),
@@ -175,10 +179,10 @@ void Viewport::paintEvent(QPaintEvent*)
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_mid(p, pp);
 
-       p.setRenderHint(QPainter::Antialiasing, false);
-
        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);