diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp index c26b2de72..10ef8393a 100644 --- a/src/libs/vgeometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -354,7 +354,7 @@ void VArc::FindF2(qreal length) startAngle.setAngle(d->f1 + arcAngle);// We use QLineF just because it is easy way correct angle value d->f2 = startAngle.angle(); - d->formulaF2 = QString().number(qApp->fromPixel(d->f2)); + d->formulaF2 = QString().number(d->f2); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h index 841349ff1..b97205b75 100644 --- a/src/libs/vgeometry/varc_p.h +++ b/src/libs/vgeometry/varc_p.h @@ -55,19 +55,19 @@ public: {} VArcData(VPointF center, qreal radius, qreal f1, qreal f2) - : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))), - f2(f2), formulaF2(QString().number(qApp->fromPixel(f2))), + : f1(f1), formulaF1(QString().number(f1)), + f2(f2), formulaF2(QString().number(f2)), radius(radius), formulaRadius(QString().number(qApp->fromPixel(radius))), center(center), isFlipped(false), formulaLength() {} - VArcData (QString formulaLength, VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1 ) + VArcData (QString formulaLength, VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1) : f1(f1), formulaF1(formulaF1), f2(0), formulaF2("0"), radius(radius), formulaRadius(formulaRadius), center(center), isFlipped(false), formulaLength(formulaLength) {} VArcData(VPointF center, qreal radius, qreal f1) - : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))), f2(0), formulaF2("0"), radius(radius), + : f1(f1), formulaF1(QString().number(f1)), f2(0), formulaF2("0"), radius(radius), formulaRadius(QString().number(qApp->fromPixel(radius))), center(center), isFlipped(false), formulaLength() {} diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp index c6c2528c0..9a3e8a946 100644 --- a/src/libs/vgeometry/vellipticalarc.cpp +++ b/src/libs/vgeometry/vellipticalarc.cpp @@ -432,7 +432,7 @@ void VEllipticalArc::FindF2(qreal length) d->f2 = endAngle; lenBez = GetLength(); } - d->formulaF2 = QString().number(qApp->fromPixel(d->f2)); + d->formulaF2 = QString().number(d->f2); d->formulaLength = QString().number(qApp->fromPixel(lenBez)); } diff --git a/src/libs/vgeometry/vellipticalarc_p.h b/src/libs/vgeometry/vellipticalarc_p.h index 325c5ac8f..5d2398b5a 100644 --- a/src/libs/vgeometry/vellipticalarc_p.h +++ b/src/libs/vgeometry/vellipticalarc_p.h @@ -23,8 +23,8 @@ public: {} VEllipticalArcData(VPointF center, qreal radius1, qreal radius2, qreal f1, qreal f2, qreal rotationAngle) - : f1(f1), f2(f2), formulaF1(QString().number(qApp->fromPixel(f1))), - formulaF2(QString().number(qApp->fromPixel(f2))), radius1(radius1), radius2(radius2), + : f1(f1), f2(f2), formulaF1(QString().number(f1)), + formulaF2(QString().number(f2)), radius1(radius1), radius2(radius2), formulaRadius1(QString().number(qApp->fromPixel(radius1))), formulaRadius2(QString().number(qApp->fromPixel(radius2))), center(center), isFlipped(false), formulaLength(), rotationAngle(rotationAngle) @@ -39,7 +39,7 @@ public: {} VEllipticalArcData(VPointF center, qreal radius1, qreal radius2, qreal f1, qreal rotationAngle) - : f1(f1), f2(0), formulaF1(QString().number(qApp->fromPixel(f1))), formulaF2("0"), + : f1(f1), f2(0), formulaF1(QString().number(f1)), formulaF2("0"), radius1(radius1), radius2(radius2), formulaRadius1(QString().number(qApp->fromPixel(radius1))), formulaRadius2(QString().number(qApp->fromPixel(radius2))),