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

[fix] migrates calls from 'simulation.rocket.selected' -> 'simulation.activeconfig'

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-08-23 21:43:08 -04:00
parent d3a66294d1
commit a00636a1ed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/optimization/rocketoptimization/domains/StabilityDomain.java
View File

@ -63,7 +63,7 @@ public class StabilityDomain implements SimulationDomain {
*/ */
AerodynamicCalculator aerodynamicCalculator = new BarrowmanCalculator(); AerodynamicCalculator aerodynamicCalculator = new BarrowmanCalculator();
FlightConfiguration configuration = simulation.getRocket().getSelectedConfiguration(); FlightConfiguration configuration = simulation.getActiveConfiguration();
FlightConditions conditions = new FlightConditions(configuration); FlightConditions conditions = new FlightConditions(configuration);
conditions.setMach(Application.getPreferences().getDefaultMach()); conditions.setMach(Application.getPreferences().getDefaultMach());
conditions.setAOA(0); conditions.setAOA(0);

2
core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java
View File

@ -71,7 +71,7 @@ public class FlightConfigurationModifier<E extends FlightConfigurableParameter<E
} }
FlightConfigurableParameterSet<E> configSet = (FlightConfigurableParameterSet<E>) configGetter.invoke(c); FlightConfigurableParameterSet<E> configSet = (FlightConfigurableParameterSet<E>) configGetter.invoke(c);
return configSet.get(simulation.getRocket().getSelectedConfiguration().getFlightConfigurationID()); return configSet.get(simulation.getFlightConfigurationId());
} }
} }

2
swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
View File

@ -292,7 +292,7 @@ public class SimulationRunDialog extends JDialog {
double otherBurn = 0; double otherBurn = 0;
FlightConfiguration config = simulation.getRocket().getSelectedConfiguration(); FlightConfiguration config = simulation.getActiveConfiguration();
Collection<MotorConfiguration> activeMotors = config.getActiveMotors(); Collection<MotorConfiguration> activeMotors = config.getActiveMotors();
for (MotorConfiguration curInstance : activeMotors) { for (MotorConfiguration curInstance : activeMotors) {