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

Removed the tumbling warning during coast to apogee.

Browse Source
This commit is contained in:
kruland2607 2014-05-20 09:29:31 -05:00
parent a3e16da57f
commit b1e53e4e6b
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -1543,7 +1543,6 @@ Warning.SUPERSONIC = Body calculations may not be entirely accurate at supersoni
Warning.RECOVERY_LAUNCH_ROD = Recovery device device deployed while on the launch guide.
Warning.RECOVERY_HIGH_SPEED = Recovery device deployment at high speed
Warning.TUMBLE_UNDER_THRUST = Stage began to tumble under thrust.
Warning.TUMBLE_BEFORE_APOGEE = Sustainer became unstable before apogee.
! Scale dialog

2
core/src/net/sf/openrocket/aerodynamics/Warning.java
View File

@ -329,6 +329,4 @@ public abstract class Warning {
public static final Warning TUMBLE_UNDER_THRUST =
new Other(trans.get("Warning.TUMBLE_UNDER_THRUST"));
public static final Warning TUMBLE_BEFORE_APOGEE =
new Other(trans.get("Warning.TUMBLE_BEFORE_APOGEE"));
}

6
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -223,12 +223,10 @@ public class BasicEventSimulationEngine implements SimulationEngine {
if (wantToTumble) {
final boolean tooMuchThrust = t > THRUST_TUMBLE_CONDITION;
final boolean isSustainer = status.getConfiguration().isStageActive(0);
final boolean notUntilApogee = isSustainer && !status.isApogeeReached();
final boolean isApogee = status.isApogeeReached();
if (tooMuchThrust) {
status.getWarnings().add(Warning.TUMBLE_UNDER_THRUST);
} else if (notUntilApogee) {
status.getWarnings().add(Warning.TUMBLE_BEFORE_APOGEE);
} else {
} else if (isApogee) {
addEvent(new FlightEvent(FlightEvent.Type.TUMBLE, status.getSimulationTime()));
status.setTumbling(true);
}