aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Circle radius should follow line width settings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-02-06 20:20:45 +02:00
parent 6e50832578
commit 077b31cc78
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/vwidgets/global.cpp
View File

@ -28,15 +28,21 @@
#include "global.h" #include "global.h"
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vmisc/vabstractapplication.h"
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QGraphicsView> #include <QGraphicsView>
static const qreal defPointRadiusPixel = (2./*mm*/ / 25.4) * PrintDPI;
const qreal minVisibleFontSize = 5; const qreal minVisibleFontSize = 5;
inline qreal DefPointRadiusPixel()
{
return (qApp->Settings()->GetLineWidth() + 0.8) / 25.4 * PrintDPI;
}
//---------------------------------------------------------------------------------------------------------------------
qreal SceneScale(QGraphicsScene *scene) qreal SceneScale(QGraphicsScene *scene)
{ {
qreal scale = 1; qreal scale = 1;
@ -79,10 +85,10 @@ QRectF PointRect(qreal radius)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal ScaledRadius(qreal scale) qreal ScaledRadius(qreal scale)
{ {
qreal scaledRadius = defPointRadiusPixel; qreal scaledRadius = DefPointRadiusPixel();
if (scale > 1) if (scale > 1)
{ {
scaledRadius = qMax(defPointRadiusPixel/96, defPointRadiusPixel/scale); scaledRadius = qMax(DefPointRadiusPixel()/96, DefPointRadiusPixel()/scale);
} }
return scaledRadius; return scaledRadius;
} }