From 3646a8858e04ac057cb5cd1f49c76274ec3f5497 Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Tue, 24 Aug 2021 13:48:35 +0200 Subject: [PATCH] =?UTF-8?q?[fixes=20#927]=C2=A0Only=20update=20flight=20da?= =?UTF-8?q?ta=20info=20for=20current=20flight=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf/openrocket/gui/scalefigure/RocketPanel.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java index 72a1684af..02a2eaa7e 100644 --- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java +++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java @@ -745,15 +745,15 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change */ private void runBackgroundSimulations(List sims, Rocket rkt) { if (sims.size() == 0) { + extraText.setCalculatingData(false); FlightConfigurationId curID = document.getSelectedConfiguration().getFlightConfigurationID(); for (Simulation sim : document.getSimulations()) { if (sim.getFlightConfigurationId().compareTo(curID) == 0) { extraText.setFlightData(sim.getSimulatedData()); - break; + return; } } - extraText.setCalculatingData(false); - return; + extraText.setFlightData(FlightData.NaN_DATA); } // I *think* every FlightConfiguration has at least one associated simulation; just in case I'm wrong, @@ -820,7 +820,12 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change if (isCancelled() || backgroundSimulationWorker != this) return; backgroundSimulationWorker = null; - extraText.setFlightData(simulation.getSimulatedData()); + + // Only set the flight data information of the current flight configuration + FlightConfigurationId curID = document.getSelectedConfiguration().getFlightConfigurationID(); + if (simulation.getFlightConfigurationId().compareTo(curID) == 0) { + extraText.setFlightData(simulation.getSimulatedData()); + } extraText.setCalculatingData(false); figure.repaint(); figure3d.repaint();