eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused center control point for color ellipses.

Browse Source
This commit is contained in:
Tats
2014-03-02 21:07:11 -05:00
parent 5de7162a59
commit d0e697d77a
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shape.cpp
+11 -16
View File
@@ -419,7 +419,8 @@ void Ellipse::setVertex(int i, const QPointF& v)
// Set vertices.
Shape::setVertex(1, transform.map( getVertex(1) ));
Shape::setVertex(3, transform.map( getVertex(3) ));
Shape::setVertex(4, transform.map( getVertex(4) ));
if (hasCenterControl())
Shape::setVertex(4, transform.map( getVertex(4) ));
}
// If changed one of the two other points, just change the vertical axis.
@@ -459,25 +460,19 @@ void Ellipse::setVertex(int i, const QPointF& v)
transform *= fromUnitCircle();
// Set vertices.
Shape::setVertex(4, transform.map( getVertex(4) ));
if (hasCenterControl())
Shape::setVertex(4, transform.map( getVertex(4) ));
}
// Center control point (make sure it stays inside!).
else
else if (hasCenterControl())
{
if (includesPoint(v))
Shape::setVertex(i, v);
// Map point as vector on a unit circle.
QVector2D vector(toUnitCircle().map(v));
else
{
// Map point as vector on a unit circle.
QVector2D vector(toUnitCircle().map(v));
// Normalize it.
vector.normalize();
// Remap it to ellipse.
Shape::setVertex(4, fromUnitCircle().map(vector.toPointF()));
}
// Clip control point.
Shape::setVertex(4, vector.length() <= 1 ?
v :
fromUnitCircle().map(vector.toPointF()));
}
}