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

restore apogeeAltitude member variable to keep track of apogee. It turns out

Browse Source 
this wasn't quite redundant before; setting it included a call to MathUtil.max() to make sure it wasn't 0.
This commit is contained in:
JoePfeiffer 2022-10-24 10:11:26 -06:00
parent acaca0a893
commit 5c8d995e7f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
View File

@ -270,6 +270,7 @@ public class SimulationRunDialog extends JDialog {
private final int index; private final int index;
private final double burnoutTimeEstimate; private final double burnoutTimeEstimate;
private volatile double burnoutVelocity; private volatile double burnoutVelocity;
private volatile double apogeeAltitude;
private final CustomExpressionSimulationListener exprListener; private final CustomExpressionSimulationListener exprListener;
@ -368,13 +369,14 @@ public class SimulationRunDialog extends JDialog {
// Past apogee, switch to landing // Past apogee, switch to landing
if (simulationStage == -1 && status.getRocketVelocity().z < 0) { if (simulationStage == -1 && status.getRocketVelocity().z < 0) {
simulationStage++; simulationStage++;
log.debug("CHANGING to simulationStage " + simulationStage + ", apogee=" + simulationMaxAltitude[index]); apogeeAltitude = MathUtil.max(simulationMaxAltitude[index], 1);
log.debug("CHANGING to simulationStage " + simulationStage + ", apogee=" + apogeeAltitude);
} }
// >= 0 Landing. z-position from apogee to zero // >= 0 Landing. z-position from apogee to zero
// TODO: MEDIUM: several stages // TODO: MEDIUM: several stages
log.debug("simulationStage landing (" + simulationStage + "): alt=" + status.getRocketPosition().z + " apogee=" + simulationMaxAltitude[index]); log.debug("simulationStage landing (" + simulationStage + "): alt=" + status.getRocketPosition().z + " apogee=" + apogeeAltitude);
setSimulationProgress(MathUtil.map(status.getRocketPosition().z, simulationMaxAltitude[index], 0, APOGEE_PROGRESS, 1.0)); setSimulationProgress(MathUtil.map(status.getRocketPosition().z, apogeeAltitude, 0, APOGEE_PROGRESS, 1.0));
updateProgress(); updateProgress();
} }