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

Changed QString("%1").arg() to QString().number() in VArc

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-02-28 21:24:56 +02:00
parent 088f0a6987
commit e8bf8a80e3
3 changed files with 10 additions and 7 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("%1").arg(d->f2); d->formulaF2 = QString().number(qApp->fromPixel(d->f2));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

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

@ -31,6 +31,7 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include <../vmisc/vabstractapplication.h>
#include "vpointf.h" #include "vpointf.h"
#ifdef Q_CC_GNU #ifdef Q_CC_GNU
@ -54,8 +55,10 @@ public:
{} {}
VArcData(VPointF center, qreal radius, qreal f1, qreal f2) VArcData(VPointF center, qreal radius, qreal f1, qreal f2)
: f1(f1), formulaF1(QString("%1").arg(f1)), f2(f2), formulaF2(QString("%1").arg(f2)), radius(radius), : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))),
formulaRadius(QString("%1").arg(radius)), center(center), isFlipped(false), formulaLength() f2(f2), formulaF2(QString().number(qApp->fromPixel(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 )
@ -64,8 +67,8 @@ public:
{} {}
VArcData(VPointF center, qreal radius, qreal f1) VArcData(VPointF center, qreal radius, qreal f1)
: f1(f1), formulaF1(QString("%1").arg(f1)), f2(0), formulaF2("0"), radius(radius), : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))), f2(0), formulaF2("0"), radius(radius),
formulaRadius(QString("%1").arg(radius)), center(center), isFlipped(false), formulaLength() formulaRadius(QString().number(qApp->fromPixel(radius))), center(center), isFlipped(false), formulaLength()
{} {}
VArcData(const VArcData &arc) VArcData(const VArcData &arc)

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

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