hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #419] Clicking in fin-point figure now calculates closest segment correctly

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-07-15 13:44:34 +01:00
parent 040c2d0091
commit eee24233cb
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java
View File

@ -241,18 +241,25 @@ public class FinPointFigure extends AbstractScaleFigure {
} }
} }
public int getIndexByPoint(double x, double y) { public Point2D.Double getPoint( final int x, final int y){
if (finPointHandles == null) if (finPointHandles == null)
return -1; return null;
// Calculate point in shapes' coordinates // Calculate point in shapes' coordinates
Point2D.Double p = new Point2D.Double(x, y); Point2D.Double p = new Point2D.Double(x, y);
try { try {
projection.inverseTransform(p, p); projection.inverseTransform(p, p);
return p;
} catch (NoninvertibleTransformException e) { } catch (NoninvertibleTransformException e) {
return -1; return null;
} }
}
public int getIndexByPoint(final int x, final int y) {
final Point2D.Double p = getPoint(x,y);
if (p == null)
return -1;
for (int i = 0; i < finPointHandles.length; i++) { for (int i = 0; i < finPointHandles.length; i++) {
if (finPointHandles[i].contains(p)) if (finPointHandles[i].contains(p))
return i; return i;
@ -260,24 +267,12 @@ public class FinPointFigure extends AbstractScaleFigure {
return -1; return -1;
} }
public int getSegmentByPoint(double x, double y) { public int getSegmentByPoint(final int x, final int y) {
if (finPointHandles == null) final Point2D.Double p = getPoint(x,y);
return -1; if (p == null)
return -1;
// Calculate point in shapes' coordinates
Point2D.Double p = new Point2D.Double(x, y); final double threshold = BOX_WIDTH_PIXELS / scale;
try {
projection.inverseTransform(p, p);
} catch (NoninvertibleTransformException e) {
return -1;
}
double x0 = p.x;
double y0 = p.y;
double delta = BOX_WIDTH_PIXELS / scale;
//System.err.println(String.format("__Point: x=%.4f, y=%.4f", x0, y0));
//System.err.println(String.format("__delta: %.4f", BOX_WIDTH_PIXELS / scale));
Coordinate[] points = finset.getFinPoints(); Coordinate[] points = finset.getFinPoints();
for (int i = 1; i < points.length; i++) { for (int i = 1; i < points.length; i++) {
@ -286,22 +281,28 @@ public class FinPointFigure extends AbstractScaleFigure {
double x2 = points[i].x; double x2 = points[i].x;
double y2 = points[i].y; double y2 = points[i].y;
//System.out.println("point1:"+x1+","+y1+" point2:"+x2+","+y2); final double segmentLength = MathUtil.hypot(x2 - x1, y2 - y1);
double u = Math.abs((x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1)) / // Distance to an infinite line, defined by two points:
MathUtil.hypot(x2 - x1, y2 - y1); // (For a more in-depth explanation, see wikipedia: https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line )
double x0 = p.x;
//System.err.println("Distance of segment " + i + " is " + u); double y0 = p.y;
final double distanceToLine = Math.abs((y2 - y1)*x0 - (x2-x1)*y0 + x2*y1 - y2*x1)/segmentLength;
if (u < delta)
return i; final double distanceToStart = MathUtil.hypot(x1-x0, y1-y0);
final double distanceToEnd = MathUtil.hypot(x2-x0, y2-y0);
final boolean withinSegment = (distanceToStart < segmentLength && distanceToEnd < segmentLength);
if ( distanceToLine < threshold && withinSegment){
return i;
}
} }
return -1; return -1;
} }
public Point2D.Double convertPoint(final double x, final double y) {
public Point2D.Double convertPoint(double x, double y) {
Point2D.Double p = new Point2D.Double(x, y); Point2D.Double p = new Point2D.Double(x, y);
try { try {
projection.inverseTransform(p, p); projection.inverseTransform(p, p);