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

Merge pull request #920 from neilbalch/RockSim_Import_Dist_Fix

Browse Source 
Fix #881, #907 issues
This commit is contained in:
Joe Pfeiffer 2021-05-24 16:41:19 -06:00 committed by GitHub
commit de10d819bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -92,3 +92,4 @@ openrocket.log
*.snap *.snap
prime/* prime/*
swing/resources/datafiles/presets/system.ser

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

@ -180,7 +180,9 @@ class FinSetHandler extends AbstractElementHandler {
finish = RocksimFinishCode.fromCode(Integer.parseInt(content)).asOpenRocket(); finish = RocksimFinishCode.fromCode(Integer.parseInt(content)).asOpenRocket();
} }
if (RocksimCommonConstants.XB.equals(element)) { if (RocksimCommonConstants.XB.equals(element)) {
location = Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH; // Opposite value accounts for the different relative distance directions used
// Issue Ref: https://github.com/openrocket/openrocket/issues/881
location = -Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH;
} }
if (RocksimCommonConstants.LOCATION_MODE.equals(element)) { if (RocksimCommonConstants.LOCATION_MODE.equals(element)) {
axialMethod = RocksimLocationMode.fromCode(Integer.parseInt(content)).asOpenRocket(); axialMethod = RocksimLocationMode.fromCode(Integer.parseInt(content)).asOpenRocket();

2
core/src/net/sf/openrocket/rocketcomponent/position/AxialMethod.java
View File

@ -95,7 +95,7 @@ public enum AxialMethod implements DistanceMethod {
// just as a reminder: // just as a reminder:
// public T[] getEnumConstants() // public T[] getEnumConstants()
public static final AxialMethod[] axialOffsetMethods = { TOP, MIDDLE, BOTTOM }; public static final AxialMethod[] axialOffsetMethods = { ABSOLUTE, TOP, MIDDLE, BOTTOM };
public final String description; public final String description;