Viewport: Don't draw the cursors and markers antialiased

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6b85e1b79d324c4788afc40b5903b02e0497d826..a4b6680a7fe57bd02ed6b5b2e59888266a4d2552 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,7 +49,6 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
        ViewWidget(parent),
-       drag_offset_(numeric_limits<double>::signaling_NaN()),
        pinch_zoom_active_(false)
 {
        setAutoFillBackground(true);
@@ -82,16 +81,16 @@ void Viewport::drag()
 
 void Viewport::drag_by(const QPoint &delta)
 {
-       if (isnan(drag_offset_))
+       if (drag_offset_ == boost::none)
                return;
 
-       view_.set_scale_offset(view_.scale(), drag_offset_ -
-               delta.x() * view_.scale());
+       view_.set_scale_offset(view_.scale(),
+               (*drag_offset_ - delta.x() * view_.scale()));
 }
 
 void Viewport::drag_release()
 {
-       drag_offset_ = numeric_limits<double>::signaling_NaN();
+       drag_offset_ = boost::none;
 }
 
 vector< shared_ptr<ViewItem> > Viewport::items()
@@ -116,8 +115,8 @@ bool Viewport::touch_event(QTouchEvent *event)
 
        if (!pinch_zoom_active_ ||
            (event->touchPointStates() & Qt::TouchPointPressed)) {
-               pinch_offset0_ = view_.offset() + view_.scale() * touchPoint0.pos().x();
-               pinch_offset1_ = view_.offset() + view_.scale() * touchPoint1.pos().x();
+               pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to<double>();
+               pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to<double>();
                pinch_zoom_active_ = true;
        }
 
@@ -176,6 +175,8 @@ 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);
        for (const shared_ptr<TimeItem> t : time_items)