From f8e74b60f03f0822e3ec230286eb29989227f019 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 28 Mar 2023 21:14:31 +0200 Subject: [PATCH] Replace explicit launch site defaults with methods --- .../openrocket/simulation/SimulationOptions.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/net/sf/openrocket/simulation/SimulationOptions.java b/core/src/net/sf/openrocket/simulation/SimulationOptions.java index 0025c1f5b..9b9a8e465 100644 --- a/core/src/net/sf/openrocket/simulation/SimulationOptions.java +++ b/core/src/net/sf/openrocket/simulation/SimulationOptions.java @@ -66,16 +66,16 @@ public class SimulationOptions implements ChangeSource, Cloneable { * and converts them into a WorldCoordinate when converting to SimulationConditions. */ - private double launchAltitude = preferences.getDouble(Preferences.LAUNCH_ALTITUDE, 0); - private double launchLatitude = preferences.getDouble(Preferences.LAUNCH_LATITUDE, 28.61); - private double launchLongitude = preferences.getDouble(Preferences.LAUNCH_LONGITUDE, -80.60); + private double launchAltitude = preferences.getLaunchAltitude(); + private double launchLatitude = preferences.getLaunchLatitude(); + private double launchLongitude = preferences.getLaunchLongitude(); private GeodeticComputationStrategy geodeticComputation = GeodeticComputationStrategy.SPHERICAL; - private boolean useISA = preferences.getBoolean(Preferences.LAUNCH_USE_ISA, true); - private double launchTemperature = preferences.getDouble(Preferences.LAUNCH_TEMPERATURE, ExtendedISAModel.STANDARD_TEMPERATURE); // In Kelvin - private double launchPressure = preferences.getDouble(Preferences.LAUNCH_PRESSURE, ExtendedISAModel.STANDARD_PRESSURE); // In Pascal + private boolean useISA = preferences.getISAAtmosphere(); + private double launchTemperature = preferences.getLaunchTemperature(); // In Kelvin + private double launchPressure = preferences.getLaunchPressure(); // In Pascal - private double timeStep = preferences.getDouble(Preferences.SIMULATION_TIME_STEP, RK4SimulationStepper.RECOMMENDED_TIME_STEP); + private double timeStep = preferences.getTimeStep(); private double maximumAngle = RK4SimulationStepper.RECOMMENDED_ANGLE_STEP; private int randomSeed = new Random().nextInt();