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

When creating a simulation use the DefaultSimulationOptionFactory.

Browse Source
This commit is contained in:
kruland2607 2013-06-04 10:05:18 -05:00
parent f70454792d
commit be62cc243e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/document/Simulation.java
View File

@ -13,6 +13,7 @@ import net.sf.openrocket.masscalc.MassCalculator;
import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.simulation.BasicEventSimulationEngine; import net.sf.openrocket.simulation.BasicEventSimulationEngine;
import net.sf.openrocket.simulation.DefaultSimulationOptionFactory;
import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightData;
import net.sf.openrocket.simulation.RK4SimulationStepper; import net.sf.openrocket.simulation.RK4SimulationStepper;
import net.sf.openrocket.simulation.SimulationConditions; import net.sf.openrocket.simulation.SimulationConditions;
@ -105,8 +106,11 @@ public class Simulation implements ChangeSource, Cloneable {
this.status = Status.NOT_SIMULATED; this.status = Status.NOT_SIMULATED;
options = new SimulationOptions(rocket); options = new SimulationOptions(rocket);
options.setMotorConfigurationID(
rocket.getDefaultConfiguration().getFlightConfigurationID()); DefaultSimulationOptionFactory f = Application.getInjector().getInstance(DefaultSimulationOptionFactory.class);
options.copyConditionsFrom(f.getDefault());
options.setMotorConfigurationID(rocket.getDefaultConfiguration().getFlightConfigurationID());
options.addChangeListener(new ConditionListener()); options.addChangeListener(new ConditionListener());
} }