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

Import motor settings even if the stage is disabled

Browse Source
This commit is contained in:
SiboVG 2023-03-28 19:08:40 +02:00
parent 8c9a04b74e
commit 9e8163e3e1
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java
View File

@ -127,13 +127,9 @@ public class SimulationListHandler extends AbstractElementHandler {
}
// Add motors to the rocket
addMotorToStage(0, sustainerEngine, sustainerIgnitionDelay, id, warnings);
if (includeBooster1) {
addMotorToStage(1, booster1Engine, booster1IgnitionDelay, id, warnings);
}
if (includeBooster2) {
addMotorToStage(2, booster2Engine, 0.0, id, warnings);
}
addMotorToStage(0, sustainerEngine, sustainerIgnitionDelay, id, true, warnings);
addMotorToStage(1, booster1Engine, booster1IgnitionDelay, id, includeBooster1, warnings);
addMotorToStage(2, booster2Engine, 0.0, id, includeBooster2, warnings);
// Set separation settings
setSeparationDelay(0, 0.0, id);
@ -152,8 +148,18 @@ public class SimulationListHandler extends AbstractElementHandler {
context.getOpenRocketDocument().addSimulation(sim);
}
/**
* Add a new motor to a stage
* @param stageNr number of the stage to add the motor to
* @param motor motor to add
* @param ignitionDelay ignition delay of the motor
* @param id flight config id to alter
* @param enableMotorMount whether the motor mount should be enabled or disabled
* @param warnings
*/
private void addMotorToStage(final int stageNr, final Motor motor, final Double ignitionDelay,
final FlightConfigurationId id, final WarningSet warnings) {
final FlightConfigurationId id, boolean enableMotorMount,
final WarningSet warnings) {
if (motor == null || rocket.getStage(stageNr) == null) {
return;
}
@ -179,6 +185,7 @@ public class SimulationListHandler extends AbstractElementHandler {
motorConfig.setIgnitionEvent(IgnitionEvent.AUTOMATIC);
}
mount.setMotorConfig(motorConfig, id);
mount.setMotorMount(enableMotorMount);
}
private void setSeparationDelay(final int stageNr, Double separationDelay,
@ -205,9 +212,6 @@ public class SimulationListHandler extends AbstractElementHandler {
mount = (MotorMount) component;
}
}
if (mount != null) {
mount.setMotorMount(true);
}
return mount;
}
}