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

[fixes #927] Update flight data text upon Run simulations action

Browse Source
This commit is contained in:
Sibo Van Gool 2021-08-26 11:41:54 +02:00
parent 3646a8858e
commit 09ac23a54c
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,10 @@ import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.SymmetricComponent; import net.sf.openrocket.rocketcomponent.SymmetricComponent;
import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightData;
import net.sf.openrocket.simulation.SimulationStatus;
import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.customexpression.CustomExpression;
import net.sf.openrocket.simulation.customexpression.CustomExpressionSimulationListener; import net.sf.openrocket.simulation.customexpression.CustomExpressionSimulationListener;
import net.sf.openrocket.simulation.exception.SimulationException;
import net.sf.openrocket.simulation.listeners.SimulationListener; import net.sf.openrocket.simulation.listeners.SimulationListener;
import net.sf.openrocket.simulation.listeners.system.GroundHitListener; import net.sf.openrocket.simulation.listeners.system.GroundHitListener;
import net.sf.openrocket.simulation.listeners.system.InterruptListener; import net.sf.openrocket.simulation.listeners.system.InterruptListener;
@ -698,6 +700,21 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
// Always update the simulation of the current configuration // Always update the simulation of the current configuration
updateSims(false); updateSims(false);
} }
// Update flight data and add flight data update trigger upon simulation changes
for (Simulation sim : document.getSimulations()) {
sim.addChangeListener(new StateChangeListener() {
@Override
public void stateChanged(EventObject e) {
if (updateFlightData(sim)) {
updateFigures();
}
}
});
if (updateFlightData(sim)) {
break;
}
}
} }
/** /**
@ -736,6 +753,25 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
runBackgroundSimulations(sims, duplicate); runBackgroundSimulations(sims, duplicate);
} }
/**
* Update the flight data text with the data of {sim}. Only update if sim is the simulation of the current flight
* configuration.
* @param sim: simulation from which the flight data is taken
* @return true if the flight data was updated, false if not
*/
private boolean updateFlightData(Simulation sim) {
FlightConfigurationId curID = document.getSelectedConfiguration().getFlightConfigurationID();
if (sim.getFlightConfigurationId().compareTo(curID) == 0) {
if (sim.hasSimulationData()) {
extraText.setFlightData(sim.getSimulatedData());
} else {
extraText.setFlightData(FlightData.NaN_DATA);
}
return true;
}
return false;
}
/** /**
* Runs a new background simulation for simulations *sims*. It will run all the simulations in sims sequentially * Runs a new background simulation for simulations *sims*. It will run all the simulations in sims sequentially
* in the background. * in the background.
@ -746,14 +782,13 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
private void runBackgroundSimulations(List<Simulation> sims, Rocket rkt) { private void runBackgroundSimulations(List<Simulation> sims, Rocket rkt) {
if (sims.size() == 0) { if (sims.size() == 0) {
extraText.setCalculatingData(false); extraText.setCalculatingData(false);
FlightConfigurationId curID = document.getSelectedConfiguration().getFlightConfigurationID();
for (Simulation sim : document.getSimulations()) { for (Simulation sim : document.getSimulations()) {
if (sim.getFlightConfigurationId().compareTo(curID) == 0) { if (updateFlightData(sim)) {
extraText.setFlightData(sim.getSimulatedData());
return; return;
} }
} }
extraText.setFlightData(FlightData.NaN_DATA); extraText.setFlightData(FlightData.NaN_DATA);
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,
@ -822,10 +857,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
backgroundSimulationWorker = null; backgroundSimulationWorker = null;
// Only set the flight data information of the current flight configuration // 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); extraText.setCalculatingData(false);
figure.repaint(); figure.repaint();
figure3d.repaint(); figure3d.repaint();