Добавлены статические методы для класса Ellipse

This commit is contained in:
Victor 2013-10-04 17:10:16 +03:00
parent 44cb090e0e
commit a04ea1b272

View File

@ -27,6 +27,10 @@ public class Ellipse {
points = Arrays.copyOf(ellipse.points, POINTS); points = Arrays.copyOf(ellipse.points, POINTS);
} }
public static Point getCenterPoint(Ellipse ellipse) {
return ellipse.getCenterPoint();
}
public Point getCenterPoint() { public Point getCenterPoint() {
int cx = (points[1].x - points[0].x) / 2 + points[0].x; int cx = (points[1].x - points[0].x) / 2 + points[0].x;
int cy = (points[2].y - points[0].y) / 2 + points[0].y; int cy = (points[2].y - points[0].y) / 2 + points[0].y;
@ -34,6 +38,10 @@ public class Ellipse {
return center; return center;
} }
public static double getSquare(Ellipse ellipse) {
return ellipse.getSquare();
}
public double getSquare() { public double getSquare() {
Point center = getCenterPoint(); Point center = getCenterPoint();
double hor = center.x - points[0].x; double hor = center.x - points[0].x;
@ -41,6 +49,10 @@ public class Ellipse {
return Math.PI * hor * ver; return Math.PI * hor * ver;
} }
public static double getDistanceOfCentres(Ellipse ellipse1, Ellipse ellipse2) {
return ellipse1.getDistanceOfCentres(ellipse2);
}
public double getDistanceOfCentres(Ellipse ellipse) { public double getDistanceOfCentres(Ellipse ellipse) {
return (getCenterPoint().distance(ellipse.getCenterPoint())); return (getCenterPoint().distance(ellipse.getCenterPoint()));
} }