From e3ab018dd190ad9b314ed90a17c2c93d9b769b28 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Tue, 23 Oct 2018 11:47:23 -0600 Subject: [PATCH] Changed order of stage simulations to work from top down, resulting in the drowp-down menus for plots and data exports to be in stage order. --- .../sf/openrocket/simulation/BasicEventSimulationEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 8cc00e1e8..f64a164c3 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -76,7 +76,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { final String branchName = simulationConfig.getRocket().getTopmostStage().getName(); currentStatus.setFlightData(new FlightDataBranch( branchName, FlightDataType.TYPE_TIME)); } - toSimulate.add(currentStatus); + toSimulate.push(currentStatus); SimulationListenerHelper.fireStartSimulation(currentStatus); do{ @@ -423,7 +423,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { boosterStatus.setFlightData(new FlightDataBranch(boosterStage.getName(), FlightDataType.TYPE_TIME)); // Mark the booster status as only having the booster. boosterStatus.getConfiguration().setOnlyStage(stageNumber); - toSimulate.add(boosterStatus); + toSimulate.push(boosterStatus); log.info(String.format("==>> @ %g; from Branch: %s ---- Branching: %s ---- \n", currentStatus.getSimulationTime(), currentStatus.getFlightData().getBranchName(), boosterStatus.getFlightData().getBranchName()));