From 077b31cc78f08ec72768ecf61cca2006774c1c9f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 6 Feb 2018 20:20:45 +0200 Subject: [PATCH] Circle radius should follow line width settings. --HG-- branch : develop --- src/libs/vwidgets/global.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libs/vwidgets/global.cpp b/src/libs/vwidgets/global.cpp index e903ef73b..0f5ff6ae7 100644 --- a/src/libs/vwidgets/global.cpp +++ b/src/libs/vwidgets/global.cpp @@ -28,15 +28,21 @@ #include "global.h" #include "../vmisc/def.h" +#include "../vmisc/vabstractapplication.h" #include #include #include #include -static const qreal defPointRadiusPixel = (2./*mm*/ / 25.4) * PrintDPI; const qreal minVisibleFontSize = 5; +inline qreal DefPointRadiusPixel() +{ + return (qApp->Settings()->GetLineWidth() + 0.8) / 25.4 * PrintDPI; +} + +//--------------------------------------------------------------------------------------------------------------------- qreal SceneScale(QGraphicsScene *scene) { qreal scale = 1; @@ -79,10 +85,10 @@ QRectF PointRect(qreal radius) //--------------------------------------------------------------------------------------------------------------------- qreal ScaledRadius(qreal scale) { - qreal scaledRadius = defPointRadiusPixel; + qreal scaledRadius = DefPointRadiusPixel(); if (scale > 1) { - scaledRadius = qMax(defPointRadiusPixel/96, defPointRadiusPixel/scale); + scaledRadius = qMax(DefPointRadiusPixel()/96, DefPointRadiusPixel()/scale); } return scaledRadius; }