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

We don't need to use qApp->fromPixel for angles

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-02-28 21:37:30 +02:00
parent e8bf8a80e3
commit 771a72711c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vgeometry/varc.cpp
View File

@ -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 startAngle.setAngle(d->f1 + arcAngle);// We use QLineF just because it is easy way correct angle value
d->f2 = startAngle.angle(); d->f2 = startAngle.angle();
d->formulaF2 = QString().number(qApp->fromPixel(d->f2)); d->formulaF2 = QString().number(d->f2);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

8
src/libs/vgeometry/varc_p.h
View File

@ -55,19 +55,19 @@ public:
{} {}
VArcData(VPointF center, qreal radius, qreal f1, qreal f2) VArcData(VPointF center, qreal radius, qreal f1, qreal f2)
: f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))), : f1(f1), formulaF1(QString().number(f1)),
f2(f2), formulaF2(QString().number(qApp->fromPixel(f2))), f2(f2), formulaF2(QString().number(f2)),
radius(radius), formulaRadius(QString().number(qApp->fromPixel(radius))), radius(radius), formulaRadius(QString().number(qApp->fromPixel(radius))),
center(center), isFlipped(false), formulaLength() 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), : f1(f1), formulaF1(formulaF1), f2(0), formulaF2("0"), radius(radius), formulaRadius(formulaRadius),
center(center), isFlipped(false), formulaLength(formulaLength) center(center), isFlipped(false), formulaLength(formulaLength)
{} {}
VArcData(VPointF center, qreal radius, qreal f1) 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() formulaRadius(QString().number(qApp->fromPixel(radius))), center(center), isFlipped(false), formulaLength()
{} {}

2
src/libs/vgeometry/vellipticalarc.cpp
View File

@ -432,7 +432,7 @@ void VEllipticalArc::FindF2(qreal length)
d->f2 = endAngle; d->f2 = endAngle;
lenBez = GetLength(); lenBez = GetLength();
} }
d->formulaF2 = QString().number(qApp->fromPixel(d->f2)); d->formulaF2 = QString().number(d->f2);
d->formulaLength = QString().number(qApp->fromPixel(lenBez)); d->formulaLength = QString().number(qApp->fromPixel(lenBez));
} }

6
src/libs/vgeometry/vellipticalarc_p.h
View File

@ -23,8 +23,8 @@ public:
{} {}
VEllipticalArcData(VPointF center, qreal radius1, qreal radius2, qreal f1, qreal f2, qreal rotationAngle) VEllipticalArcData(VPointF center, qreal radius1, qreal radius2, qreal f1, qreal f2, qreal rotationAngle)
: f1(f1), f2(f2), formulaF1(QString().number(qApp->fromPixel(f1))), : f1(f1), f2(f2), formulaF1(QString().number(f1)),
formulaF2(QString().number(qApp->fromPixel(f2))), radius1(radius1), radius2(radius2), formulaF2(QString().number(f2)), radius1(radius1), radius2(radius2),
formulaRadius1(QString().number(qApp->fromPixel(radius1))), formulaRadius1(QString().number(qApp->fromPixel(radius1))),
formulaRadius2(QString().number(qApp->fromPixel(radius2))), formulaRadius2(QString().number(qApp->fromPixel(radius2))),
center(center), isFlipped(false), formulaLength(), rotationAngle(rotationAngle) center(center), isFlipped(false), formulaLength(), rotationAngle(rotationAngle)
@ -39,7 +39,7 @@ public:
{} {}
VEllipticalArcData(VPointF center, qreal radius1, qreal radius2, qreal f1, qreal rotationAngle) 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), radius1(radius1), radius2(radius2),
formulaRadius1(QString().number(qApp->fromPixel(radius1))), formulaRadius1(QString().number(qApp->fromPixel(radius1))),
formulaRadius2(QString().number(qApp->fromPixel(radius2))), formulaRadius2(QString().number(qApp->fromPixel(radius2))),