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

update rocket max altitude on either positive rocket Z velocity or actual

Browse Source 
increase in altitude

create new SimulationStatus to report
This commit is contained in:
JoePfeiffer 2022-10-24 09:22:38 -06:00
parent 3d3c32b3c9
commit acaca0a893
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,9 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.gui.widgets.SelectColorButton; import net.sf.openrocket.gui.widgets.SelectColorButton;
public class SimulationRunDialog extends JDialog { public class SimulationRunDialog extends JDialog {
private static final long serialVersionUID = -1593459321777026455L; private static final long serialVersionUID = -1593459321777026455L;
private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class); private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class);
@ -328,10 +328,11 @@ public class SimulationRunDialog extends JDialog {
// in order to calculate things like optimal coast time, we'll keep updating max altitude // in order to calculate things like optimal coast time, we'll keep updating max altitude
// whenever we see that the rocket is going upwards. The last apogee found is the real one. // whenever we see that the rocket is going upwards. The last apogee found is the real one.
for (SimulationStatus s : chunks) { for (SimulationStatus s : chunks) {
if (s.getConfiguration().isStageActive(0) && (s.getRocketVelocity().z > 0)) { if (s.getConfiguration().isStageActive(0) &&
((s.getRocketVelocity().z > 0) || (s.getRocketPosition().z > simulationMaxAltitude[index]))) {
log.debug("updating simulationMaxAltitude[" + index + "] to " + s.getRocketPosition().z); log.debug("updating simulationMaxAltitude[" + index + "] to " + s.getRocketPosition().z);
simulationMaxAltitude[index] = s.getRocketPosition().z; simulationMaxAltitude[index] = s.getRocketPosition().z;
simulationMaxVelocity[index] = Math.max(simulationMaxVelocity[index], s.getRocketVelocity().length()); simulationMaxVelocity[index] = Math.max(simulationMaxVelocity[index], s.getRocketVelocity().z);
} }
} }
@ -372,7 +373,6 @@ public class SimulationRunDialog extends JDialog {
// >= 0 Landing. z-position from apogee to zero // >= 0 Landing. z-position from apogee to zero
// TODO: MEDIUM: several stages // TODO: MEDIUM: several stages
System.out.flush();
log.debug("simulationStage landing (" + simulationStage + "): alt=" + status.getRocketPosition().z + " apogee=" + simulationMaxAltitude[index]); log.debug("simulationStage landing (" + simulationStage + "): alt=" + status.getRocketPosition().z + " apogee=" + simulationMaxAltitude[index]);
setSimulationProgress(MathUtil.map(status.getRocketPosition().z, simulationMaxAltitude[index], 0, APOGEE_PROGRESS, 1.0)); setSimulationProgress(MathUtil.map(status.getRocketPosition().z, simulationMaxAltitude[index], 0, APOGEE_PROGRESS, 1.0));
updateProgress(); updateProgress();
@ -449,16 +449,17 @@ public class SimulationRunDialog extends JDialog {
switch (event.getType()) { switch (event.getType()) {
case APOGEE: case APOGEE:
log.debug("APOGEE"); log.debug("APOGEE");
publish(status); publish(new SimulationStatus(status));
break; break;
case LAUNCH: case LAUNCH:
publish(status); log.debug("LAUNCH");
publish(new SimulationStatus(status));
break; break;
case SIMULATION_END: case SIMULATION_END:
log.debug("END"); log.debug("END");
publish(status); publish(new SimulationStatus(status));
break; break;
default: default:
@ -471,7 +472,7 @@ public class SimulationRunDialog extends JDialog {
public void postStep(SimulationStatus status) { public void postStep(SimulationStatus status) {
if (System.currentTimeMillis() >= time + UPDATE_MS) { if (System.currentTimeMillis() >= time + UPDATE_MS) {
time = System.currentTimeMillis(); time = System.currentTimeMillis();
publish(status); publish(new SimulationStatus(status));
} }
} }
} }