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

[#1220] Fix RockSim fin import issue

Browse Source
This commit is contained in:
SiboVG 2022-03-05 17:06:47 +01:00
parent 939a07e9e0
commit 5074ac827e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ package net.sf.openrocket.file.rocksim.importt;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@ -359,17 +360,25 @@ class FinSetHandler extends AbstractElementHandler {
* @return an array of OpenRocket Coordinates * @return an array of OpenRocket Coordinates
*/ */
private Coordinate[] toCoordinates(String newPointList, WarningSet warnings) { private Coordinate[] toCoordinates(String newPointList, WarningSet warnings) {
List<Coordinate> result = new ArrayList<Coordinate>(); 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 (String point : points) { for (int i = 0; i < points.length; i++) {
String[] aPoint = point.split(","); String[] aPoint = points[i].split(",");
try { try {
if (aPoint.length > 1) { if (aPoint.length > 1) {
Coordinate c = new Coordinate( Coordinate c = new Coordinate(
Double.parseDouble(aPoint[0]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, Double.parseDouble(aPoint[0]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH,
Double.parseDouble(aPoint[1]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); Double.parseDouble(aPoint[1]) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
result.add(c); 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 { else {
warnings.add("Invalid fin point pair."); warnings.add("Invalid fin point pair.");