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

Added rotation of points

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-02-12 20:19:46 +02:00
parent 894ad4ea66
commit 560a3dc1d1
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,10 +159,15 @@ qreal VEllipticalArc::GetLength() const
*/ */
QPointF VEllipticalArc::GetP1() const QPointF VEllipticalArc::GetP1() const
{ {
// we ignore the rotation! // p1 - point without rotation
QPointF p1 ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(d->f1*M_PI/180)), QPointF p1 ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(d->f1*M_PI/180)),
GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(d->f1*M_PI/180))); GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(d->f1*M_PI/180)));
return p1; // rotation of point
QPointF pointRotation;
pointRotation.setX(p1.rx()*qCos(GetRotationAngle()) - p1.ry()*qSin(GetRotationAngle()));
pointRotation.setY(p1.rx()*qSin(GetRotationAngle()) + p1.ry()*qCos(GetRotationAngle()));
return pointRotation;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -172,10 +177,15 @@ QPointF VEllipticalArc::GetP1() const
*/ */
QPointF VEllipticalArc::GetP2 () const QPointF VEllipticalArc::GetP2 () const
{ {
// we ignore the rotation! // p2 - point without rotation
QPointF p2 ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(d->f2*M_PI/180)), QPointF p2 ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(d->f2*M_PI/180)),
GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(d->f2*M_PI/180))); GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(d->f2*M_PI/180)));
return p2; // rotation of point
QPointF pointRotation;
pointRotation.setX(p2.rx()*qCos(GetRotationAngle()) - p2.ry()*qSin(GetRotationAngle()));
pointRotation.setY(p2.rx()*qSin(GetRotationAngle()) + p2.ry()*qCos(GetRotationAngle()));
return pointRotation;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -185,10 +195,16 @@ QPointF VEllipticalArc::GetP2 () const
*/ */
QPointF VEllipticalArc::GetPoint (qreal angle) const QPointF VEllipticalArc::GetPoint (qreal angle) const
{ {
// we ignore the rotation! // p - point without rotation
QPointF p ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(angle*M_PI/180)), QPointF p ( GetCenter().x () + qFloor((d->radius1 + d->radius2)*cos(angle*M_PI/180)),
GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(angle*M_PI/180))); GetCenter().y () + qFloor((d->radius1 + d->radius2)*sin(angle*M_PI/180)));
return p;
// rotation of point
QPointF pointRotation;
pointRotation.setX(p.rx()*qCos(GetRotationAngle()) - p.ry()*qSin(GetRotationAngle()));
pointRotation.setY(p.rx()*qSin(GetRotationAngle()) + p.ry()*qCos(GetRotationAngle()));
return pointRotation;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -217,7 +233,6 @@ qreal VEllipticalArc::AngleArc() const
return ang; return ang;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief GetAngles return list of angles needed for drawing arc. * @brief GetAngles return list of angles needed for drawing arc.
@ -295,9 +310,7 @@ QVector<QPointF> VEllipticalArc::GetPoints() const
} }
points << splPoints; points << splPoints;
} }
points << splPoints;
} }
// we ignore the rotation of ellipse.
return points; return points;
} }
@ -422,6 +435,16 @@ QString VEllipticalArc::GetFormulaRadius2() const
return d->formulaRadius2; return d->formulaRadius2;
} }
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief GetRotationAngle return rotation angle.
* @return rotationAngle.
*/
qreal VEllipticalArc::GetRotationAngle() const
{
return d->rotationAngle;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VEllipticalArc::SetFormulaRadius1(const QString &formula, qreal value) void VEllipticalArc::SetFormulaRadius1(const QString &formula, qreal value)
{ {

3
src/libs/vgeometry/vellipticalarc.h
View File

@ -65,6 +65,8 @@ public:
void SetFormulaF2 (const QString &formula, qreal value); void SetFormulaF2 (const QString &formula, qreal value);
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
qreal GetRotationAngle() const;
QString GetFormulaRadius1 () const; QString GetFormulaRadius1 () const;
QString GetFormulaRadius2 () const; QString GetFormulaRadius2 () const;
void SetFormulaRadius1 (const QString &formula, qreal value); void SetFormulaRadius1 (const QString &formula, qreal value);
@ -83,6 +85,7 @@ public:
QPointF GetP2 () const; QPointF GetP2 () const;
QPointF GetPoint (qreal angle) const; QPointF GetPoint (qreal angle) const;
qreal AngleArc() const; qreal AngleArc() const;
QVector<qreal> GetAngles () const;
QVector<QPointF> GetPoints () const; QVector<QPointF> GetPoints () const;
QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const; QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const;
QPointF CutArc (const qreal &length) const; QPointF CutArc (const qreal &length) const;