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

Merge pull request #461 from JoePfeiffer/simulate-in-order

Browse Source 
Stack stage simulations
This commit is contained in:
Wes Cravens 2018-10-23 13:12:29 -05:00 committed by GitHub
commit fa33c3d823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
final String branchName = simulationConfig.getRocket().getTopmostStage().getName(); final String branchName = simulationConfig.getRocket().getTopmostStage().getName();
currentStatus.setFlightData(new FlightDataBranch( branchName, FlightDataType.TYPE_TIME)); currentStatus.setFlightData(new FlightDataBranch( branchName, FlightDataType.TYPE_TIME));
} }
toSimulate.add(currentStatus); toSimulate.push(currentStatus);
SimulationListenerHelper.fireStartSimulation(currentStatus); SimulationListenerHelper.fireStartSimulation(currentStatus);
do{ do{
@ -423,7 +423,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
boosterStatus.setFlightData(new FlightDataBranch(boosterStage.getName(), FlightDataType.TYPE_TIME)); boosterStatus.setFlightData(new FlightDataBranch(boosterStage.getName(), FlightDataType.TYPE_TIME));
// Mark the booster status as only having the booster. // Mark the booster status as only having the booster.
boosterStatus.getConfiguration().setOnlyStage(stageNumber); boosterStatus.getConfiguration().setOnlyStage(stageNumber);
toSimulate.add(boosterStatus); toSimulate.push(boosterStatus);
log.info(String.format("==>> @ %g; from Branch: %s ---- Branching: %s ---- \n", log.info(String.format("==>> @ %g; from Branch: %s ---- Branching: %s ---- \n",
currentStatus.getSimulationTime(), currentStatus.getSimulationTime(),
currentStatus.getFlightData().getBranchName(), boosterStatus.getFlightData().getBranchName())); currentStatus.getFlightData().getBranchName(), boosterStatus.getFlightData().getBranchName()));