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

Make sure active motor list is updated after all stage state changes

Browse Source 
Use getActiveMotors() instead of getMotors() to get motors in thrust calculation
This commit is contained in:
JoePfeiffer 2022-03-07 09:46:27 -07:00
parent 2aa6a84bf7
commit 24e1dcc7fe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -109,23 +109,23 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
public void clearAllStages() { public void clearAllStages() {
this._setAllStages(false); this._setAllStages(false);
this.updateMotors();
} }
public void setAllStages() { public void setAllStages() {
this._setAllStages(true); this._setAllStages(true);
this.updateMotors();
} }
private void _setAllStages(final boolean _active) { private void _setAllStages(final boolean _active) {
for (StageFlags cur : stages.values()) { for (StageFlags cur : stages.values()) {
cur.active = _active; cur.active = _active;
} }
updateMotors();
} }
public void copyStages(FlightConfiguration other) { public void copyStages(FlightConfiguration other) {
for (StageFlags cur : other.stages.values()) for (StageFlags cur : other.stages.values())
stages.put(cur.stageNumber, new StageFlags(cur.stageNumber, cur.active)); stages.put(cur.stageNumber, new StageFlags(cur.stageNumber, cur.active));
updateMotors();
} }
/** /**
@ -135,6 +135,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
*/ */
public void clearStage(final int stageNumber) { public void clearStage(final int stageNumber) {
_setStageActive( stageNumber, false ); _setStageActive( stageNumber, false );
updateMotors();
} }
/** /**
@ -196,7 +197,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
flags.active = !flags.active; flags.active = !flags.active;
return; return;
} }
this.updateMotors(); updateMotors();
log.error("error: attempt to retrieve via a bad stage number: " + stageNumber); log.error("error: attempt to retrieve via a bad stage number: " + stageNumber);
} }

2
core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
View File

@ -181,7 +181,7 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
thrust = 0; thrust = 0;
final double currentTime = status.getSimulationTime() + timestep; final double currentTime = status.getSimulationTime() + timestep;
Collection<MotorClusterState> activeMotorList = status.getMotors(); Collection<MotorClusterState> activeMotorList = status.getActiveMotors();
for (MotorClusterState currentMotorState : activeMotorList ) { for (MotorClusterState currentMotorState : activeMotorList ) {
thrust += currentMotorState.getAverageThrust( status.getSimulationTime(), currentTime ); thrust += currentMotorState.getAverageThrust( status.getSimulationTime(), currentTime );
//thrust += currentMotorState.getThrust( currentTime ); //thrust += currentMotorState.getThrust( currentTime );