Disable antialiasing on high-DPI displays

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index d9b72addb6a512fea60ed9311b17babffecb6c6a..599246418b1993bd74ffaf1d9c51a1e14a2b860d 100644 (file)
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -319,6 +319,7 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 
 void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
 
 void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {

+       bool wasAntialiased = p.testRenderHint(QPainter::Antialiasing);

        p.setRenderHint(QPainter::Antialiasing, false);
 
        if (pos_vdivs_ > 0) {
        p.setRenderHint(QPainter::Antialiasing, false);
 
        if (pos_vdivs_ > 0) {


@@ -363,7 +364,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
                }
        }
 
                }
        }
 

-       p.setRenderHint(QPainter::Antialiasing, true);
+       p.setRenderHint(QPainter::Antialiasing, wasAntialiased);

 }
 
 void AnalogSignal::paint_trace(QPainter &p,
 }
 
 void AnalogSignal::paint_trace(QPainter &p,

diff --git a/pv/views/trace/trace.cpp b/pv/views/trace/trace.cpp
index d7e02bcaae5603e9a55d27ff791d1ceb3ef00906..65abaf0cec2e095032b0ed6ec74a3e45ce2686a2 100644 (file)
--- a/pv/views/trace/trace.cpp
+++ b/pv/views/trace/trace.cpp
@@ -292,12 +292,13 @@ void Trace::paint_back(QPainter &p, ViewItemPaintParams &pp)
 
 void Trace::paint_axis(QPainter &p, ViewItemPaintParams &pp, int y)
 {
 
 void Trace::paint_axis(QPainter &p, ViewItemPaintParams &pp, int y)
 {

+       bool wasAntialiased = p.testRenderHint(QPainter::Antialiasing);

        p.setRenderHint(QPainter::Antialiasing, false);
 
        p.setPen(axis_pen_);
        p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y));
 
        p.setRenderHint(QPainter::Antialiasing, false);
 
        p.setPen(axis_pen_);
        p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y));
 

-       p.setRenderHint(QPainter::Antialiasing, true);
+       p.setRenderHint(QPainter::Antialiasing, wasAntialiased);

 }
 
 void Trace::add_color_option(QWidget *parent, QFormLayout *form)
 }
 
 void Trace::add_color_option(QWidget *parent, QFormLayout *form)


@@ -328,10 +329,11 @@ void Trace::paint_hover_marker(QPainter &p)
 
        const pair<int, int> extents = v_extents();
 
 
        const pair<int, int> extents = v_extents();
 

+       bool wasAntialiased = p.testRenderHint(QPainter::Antialiasing);

        p.setRenderHint(QPainter::Antialiasing, false);
        p.drawLine(x, get_visual_y() + extents.first,
                x, get_visual_y() + extents.second);
        p.setRenderHint(QPainter::Antialiasing, false);
        p.drawLine(x, get_visual_y() + extents.first,
                x, get_visual_y() + extents.second);

-       p.setRenderHint(QPainter::Antialiasing, true);
+       p.setRenderHint(QPainter::Antialiasing, wasAntialiased);

 }
 
 void Trace::create_popup_form()
 }
 
 void Trace::create_popup_form()

diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp
index 83abb7b6cbd5273f699a204d2720e4404f6c00e2..44c912a1acf1ccc117718d09cbc45b816e64a284 100644 (file)
--- a/pv/views/trace/viewport.cpp
+++ b/pv/views/trace/viewport.cpp
@@ -30,6 +30,8 @@
 #include <pv/session.hpp>
 
 #include <QMouseEvent>
 #include <pv/session.hpp>
 
 #include <QMouseEvent>

+#include <QScreen>
+#include <QWindow>

 
 #include <QDebug>
 
 
 #include <QDebug>
 


@@ -172,7 +174,10 @@ void Viewport::paintEvent(QPaintEvent*)
                [](const shared_ptr<TimeItem> &t) { return !t; }));
 
        QPainter p(this);
                [](const shared_ptr<TimeItem> &t) { return !t; }));
 
        QPainter p(this);

-       p.setRenderHint(QPainter::Antialiasing);
+
+       bool useAntialiasing =
+               window()->windowHandle()->screen()->devicePixelRatio() < 2.0;
+       p.setRenderHint(QPainter::Antialiasing, useAntialiasing);

 
        for (LayerPaintFunc *paint_func = layer_paint_funcs;
                        *paint_func; paint_func++) {
 
        for (LayerPaintFunc *paint_func = layer_paint_funcs;
                        *paint_func; paint_func++) {