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

Clean up method

Browse Source
This commit is contained in:
SiboVG 2022-10-29 01:53:16 +02:00
parent 903a13cc91
commit 9df0fd9bb6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java
View File

@ -376,25 +376,25 @@ class FinSetHandler extends AbstractElementHandler {
List<Coordinate> result = new LinkedList<>(); List<Coordinate> result = new LinkedList<>();
if (newPointList != null && newPointList.length() > 0) { if (newPointList != null && newPointList.length() > 0) {
String[] points = newPointList.split("\\Q|\\E"); String[] points = newPointList.split("\\Q|\\E");
for (int i = 0; i < points.length; i++) { for (String point : points) {
String[] aPoint = points[i].split(","); String[] aPoint = point.split(",");
try { try {
if (aPoint.length > 1) { if (aPoint.length <= 1) {
Coordinate c = new Coordinate(
Double.parseDouble(aPoint[0]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH,
Double.parseDouble(aPoint[1]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
if (result.size() == 0) {
result.add(c);
continue;
}
Coordinate lastCoord = result.get(result.size() - 1);
// RockSim sometimes saves a multitude of '0,0' coordinates, so ignore this
if (! ((lastCoord.x == 0) && (lastCoord.y == 0) && (c.x == 0) && (c.y == 0))) {
result.add(c);
}
}
else {
warnings.add("Invalid fin point pair."); warnings.add("Invalid fin point pair.");
continue;
}
Coordinate c = new Coordinate(
Double.parseDouble(aPoint[0]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH,
Double.parseDouble(aPoint[1]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
if (result.size() == 0) {
result.add(c);
continue;
}
Coordinate lastCoord = result.get(result.size() - 1);
// RockSim sometimes saves a multitude of '0,0' coordinates, so ignore this
if (!((lastCoord.x == 0) && (lastCoord.y == 0) && (c.x == 0) && (c.y == 0))) {
result.add(c);
} }
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
warnings.add("Fin point not in numeric format."); warnings.add("Fin point not in numeric format.");
@ -409,8 +409,8 @@ class FinSetHandler extends AbstractElementHandler {
} }
} }
} }
final Coordinate[] coords = new Coordinate[result.size()];
return result.toArray(coords); return result.toArray(new Coordinate[0]);
} }