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

Reenable calls to setMotorMount in rocksim import code.

Browse Source
This commit is contained in:
Kevin Ruland 2015-12-13 14:17:28 -06:00
parent 9edf111a56
commit d12f7b596f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java
View File

@ -72,9 +72,7 @@ class BodyTubeHandler extends BaseHandler<BodyTube> {
bodyTube.setFinish(RocksimFinishCode.fromCode(Integer.parseInt(content)).asOpenRocket()); bodyTube.setFinish(RocksimFinishCode.fromCode(Integer.parseInt(content)).asOpenRocket());
} }
if (RocksimCommonConstants.IS_MOTOR_MOUNT.equals(element)) { if (RocksimCommonConstants.IS_MOTOR_MOUNT.equals(element)) {
// silently ignore. This information is redundant now. bodyTube.setMotorMount("1".equals(content));
// TODO: remove entirely
//bodyTube.setMotorMount("1".equals(content));
} }
if (RocksimCommonConstants.ENGINE_OVERHANG.equals(element)) { if (RocksimCommonConstants.ENGINE_OVERHANG.equals(element)) {
bodyTube.setMotorOverhang(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); bodyTube.setMotorOverhang(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
@ -102,6 +100,7 @@ class BodyTubeHandler extends BaseHandler<BodyTube> {
* *
* @return BULK * @return BULK
*/ */
@Override
public Material.Type getMaterialType() { public Material.Type getMaterialType() {
return Material.Type.BULK; return Material.Type.BULK;
} }

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

@ -69,9 +69,7 @@ class InnerBodyTubeHandler extends PositionDependentHandler<InnerTube> {
bodyTube.setLength(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); bodyTube.setLength(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
} }
if (RocksimCommonConstants.IS_MOTOR_MOUNT.equals(element)) { if (RocksimCommonConstants.IS_MOTOR_MOUNT.equals(element)) {
// silently ignore. This information is redundant now. bodyTube.setMotorMount("1".equals(content));
// TODO: remove entirely
//bodyTube.setMotorMount("1".equals(content));
} }
if (RocksimCommonConstants.ENGINE_OVERHANG.equals(element)) { if (RocksimCommonConstants.ENGINE_OVERHANG.equals(element)) {
bodyTube.setMotorOverhang(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); bodyTube.setMotorOverhang(Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);