diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index e811eaa88..9f42657ce 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -206,7 +206,7 @@ void DialogCurveIntersectAxis::ShowDialog(bool click) QLineF line = QLineF(static_cast(*point), scene->getScenePos()); //Radius of point circle, but little bigger. Need handle with hover sizes. - if (line.length() <= defPointRadiusPixel*1.5) + if (line.length() <= ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5) { return; } diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 66cb2738d..921479fa1 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -316,7 +316,7 @@ void DialogEndLine::ShowDialog(bool click) QLineF line = QLineF(static_cast(*point), scene->getScenePos()); //Radius of point circle, but little bigger. Need handle with hover sizes. - if (line.length() <= defPointRadiusPixel*1.5) + if (line.length() <= ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5) { return; } diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 33a6965e8..2f56f2731 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -236,7 +236,7 @@ void DialogLineIntersectAxis::ShowDialog(bool click) QLineF line = QLineF(static_cast(*point), scene->getScenePos()); //Radius of point circle, but little bigger. Need handle with hover sizes. - if (line.length() <= defPointRadiusPixel*1.5) + if (line.length() <= ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5) { return; } diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 6f9a673ff..e518c2fd0 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -216,7 +216,7 @@ void DialogRotation::ShowDialog(bool click) const QLineF line = QLineF(static_cast(*point), scene->getScenePos()); //Radius of point circle, but little bigger. Need handle with hover sizes. - if (line.length() <= defPointRadiusPixel*1.5) + if (line.length() <= ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5) { return; } diff --git a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp index eaea0b042..11a846f1c 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp +++ b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp @@ -116,7 +116,7 @@ void VisToolRotation::RefreshGeometry() DrawLine(xAxis, QLineF(static_cast(*origin), Ray(static_cast(*origin), 0)), supportColor2, Qt::DashLine); - VArc arc(*origin, defPointRadiusPixel*2, 0, tempAngle); + VArc arc(*origin, ScaledRadius(SceneScale(qApp->getCurrentScene()))*2, 0, tempAngle); DrawPath(angleArc, arc.GetPath(), supportColor2, Qt::SolidLine, Qt::RoundCap); Visualization::toolTip = tr("Rotating angle = %1°, Shift - sticking angle, " diff --git a/src/libs/vtools/visualization/path/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp index a0b2a7a6e..ab3c84804 100644 --- a/src/libs/vtools/visualization/path/vistoolspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolspline.cpp @@ -86,7 +86,7 @@ VisToolSpline::~VisToolSpline() void VisToolSpline::RefreshGeometry() { //Radius of point circle, but little bigger. Need handle with hover sizes. - const static qreal radius = defPointRadiusPixel*1.5; + const static qreal radius = ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5; if (object1Id > NULL_ID) { diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp index afb74810b..8cb595997 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp @@ -213,7 +213,7 @@ void VisToolSplinePath::Creating(const QPointF &pSpl, int size) if (not ctrlPoints[lastPoint]->isVisible()) { //Radius of point circle, but little bigger. Need handle with hover sizes. - if (QLineF(pSpl, ctrlPoint).length() > defPointRadiusPixel*1.5) + if (QLineF(pSpl, ctrlPoint).length() > ScaledRadius(SceneScale(qApp->getCurrentScene()))*1.5) { if (size == 1) { diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 5ac7d2912..8b8c170c7 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -255,7 +255,6 @@ VScaledEllipse *Visualization::GetPointItem(QVector &points, q points.append(point); return point; } - return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -269,7 +268,7 @@ VScaledEllipse *Visualization::InitPointItem(const QColor &color, QGraphicsItem visPen.setColor(color); point->setPen(visPen); - point->setRect(PointRect(defPointRadiusPixel)); + point->setRect(PointRect(ScaledRadius(SceneScale(qApp->getCurrentScene())))); point->setPos(QPointF()); point->setFlags(QGraphicsItem::ItemStacksBehindParent); point->setZValue(z); diff --git a/src/libs/vwidgets/global.cpp b/src/libs/vwidgets/global.cpp index 0304f3fa5..71fe0e689 100644 --- a/src/libs/vwidgets/global.cpp +++ b/src/libs/vwidgets/global.cpp @@ -33,7 +33,7 @@ #include #include -const qreal defPointRadiusPixel = (2./*mm*/ / 25.4) * PrintDPI; +static const qreal defPointRadiusPixel = (2./*mm*/ / 25.4) * PrintDPI; const qreal widthMainLine = (1.2/*mm*/ / 25.4) * PrintDPI; const qreal widthHairLine = widthMainLine/3.0; diff --git a/src/libs/vwidgets/global.h b/src/libs/vwidgets/global.h index f21ac2a74..9afec52ce 100644 --- a/src/libs/vwidgets/global.h +++ b/src/libs/vwidgets/global.h @@ -31,7 +31,6 @@ #include -extern const qreal defPointRadiusPixel; extern const qreal widthMainLine; extern const qreal widthHairLine;