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

[fixes #927] Fix run up-to-date sims on flight configuration change

Browse Source
This commit is contained in:
Sibo Van Gool 2021-08-11 02:21:28 +02:00
parent a57d6a9b53
commit 115f679cdc
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -718,6 +718,9 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
// Re-run the present simulation(s) // Re-run the present simulation(s)
List<Simulation> sims = new LinkedList<>(); List<Simulation> sims = new LinkedList<>();
for (Simulation sim : document.getSimulations()) { for (Simulation sim : document.getSimulations()) {
if (sim.getStatus() == Simulation.Status.UPTODATE || sim.getStatus() == Simulation.Status.LOADED)
continue;
// Find a Simulation based on the current flight configuration // Find a Simulation based on the current flight configuration
if (!updateAllSims) { if (!updateAllSims) {
if (sim.getFlightConfigurationId().compareTo(curID) == 0) { if (sim.getFlightConfigurationId().compareTo(curID) == 0) {
@ -740,6 +743,18 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
* @param rkt rocket for which the simulations are run * @param rkt rocket for which the simulations are run
*/ */
private void runBackgroundSimulations(List<Simulation> sims, Rocket rkt) { private void runBackgroundSimulations(List<Simulation> sims, Rocket rkt) {
if (sims.size() == 0) {
FlightConfigurationId curID = document.getSelectedConfiguration().getFlightConfigurationID();
for (Simulation sim : document.getSimulations()) {
if (sim.getFlightConfigurationId().compareTo(curID) == 0) {
extraText.setFlightData(sim.getSimulatedData());
break;
}
}
extraText.setCalculatingData(false);
return;
}
// I *think* every FlightConfiguration has at least one associated simulation; just in case I'm wrong, // I *think* every FlightConfiguration has at least one associated simulation; just in case I'm wrong,
// if there isn't one we'll create a new simulation to update the statistics in the panel using the // if there isn't one we'll create a new simulation to update the statistics in the panel using the
// default simulation conditions // default simulation conditions