geodetic computations
[debian/openrocket] / src / net / sf / openrocket / gui / main / SimulationEditDialog.java
index 90561b49c96079305f0f2f9c94e1e115496c1281..92c2dac81aebc5a6d9c0a33b2c0c084338417346 100644 (file)
@@ -34,6 +34,7 @@ import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.gui.SpinnerEditor;
 import net.sf.openrocket.gui.adaptors.BooleanModel;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
+import net.sf.openrocket.gui.adaptors.EnumModel;
 import net.sf.openrocket.gui.adaptors.MotorConfigurationModel;
 import net.sf.openrocket.gui.components.BasicSlider;
 import net.sf.openrocket.gui.components.DescriptionArea;
@@ -47,9 +48,9 @@ import net.sf.openrocket.models.atmosphere.ExtendedISAModel;
 import net.sf.openrocket.rocketcomponent.Configuration;
 import net.sf.openrocket.simulation.FlightData;
 import net.sf.openrocket.simulation.FlightDataBranch;
+import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.simulation.RK4SimulationStepper;
 import net.sf.openrocket.simulation.SimulationOptions;
-import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.simulation.listeners.SimulationListener;
 import net.sf.openrocket.simulation.listeners.example.CSVSaveListener;
 import net.sf.openrocket.startup.Application;
@@ -57,6 +58,7 @@ import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.Chars;
 import net.sf.openrocket.util.GUIUtil;
+import net.sf.openrocket.util.GeodeticComputationStrategy;
 import net.sf.openrocket.util.Icons;
 import net.sf.openrocket.util.Prefs;
 
@@ -73,22 +75,22 @@ import org.jfree.data.xy.XYSeriesCollection;
 
 
 public class SimulationEditDialog extends JDialog {
-
+       
        public static final int DEFAULT = -1;
        public static final int EDIT = 1;
        public static final int PLOT = 2;
        
-       
+
        private final Window parentWindow;
        private final Simulation simulation;
        private final SimulationOptions conditions;
        private final Configuration configuration;
        private static final Translator trans = Application.getTranslator();
-
+       
        
        public SimulationEditDialog(Window parent, Simulation s) {
                this(parent, s, 0);
-       }       
+       }
        
        public SimulationEditDialog(Window parent, Simulation s, int tab) {
                //// Edit simulation
@@ -99,7 +101,7 @@ public class SimulationEditDialog extends JDialog {
                this.conditions = simulation.getOptions();
                configuration = simulation.getConfiguration();
                
-               JPanel mainPanel = new JPanel(new MigLayout("fill","[grow, fill]"));
+               JPanel mainPanel = new JPanel(new MigLayout("fill", "[grow, fill]"));
                
                //// Simulation name:
                mainPanel.add(new JLabel(trans.get("simedtdlg.lbl.Simname") + " "), "span, split 2, shrink");
@@ -109,19 +111,22 @@ public class SimulationEditDialog extends JDialog {
                        public void changedUpdate(DocumentEvent e) {
                                setText();
                        }
+                       
                        @Override
                        public void insertUpdate(DocumentEvent e) {
                                setText();
                        }
+                       
                        @Override
                        public void removeUpdate(DocumentEvent e) {
                                setText();
                        }
+                       
                        private void setText() {
                                String name = field.getText();
                                if (name == null || name.equals(""))
                                        return;
-                               System.out.println("Setting name:"+name);
+                               System.out.println("Setting name:" + name);
                                simulation.setName(name);
                                
                        }
@@ -153,11 +158,11 @@ public class SimulationEditDialog extends JDialog {
                }
                
                mainPanel.add(tabbedPane, "spanx, grow, wrap");
-
                
+
                // Buttons
                mainPanel.add(new JPanel(), "spanx, split, growx");
-
+               
                JButton button;
                //// Run simulation button
                button = new JButton(trans.get("simedtdlg.but.runsimulation"));
@@ -180,7 +185,7 @@ public class SimulationEditDialog extends JDialog {
                });
                mainPanel.add(close, "");
                
-               
+
                this.add(mainPanel);
                this.validate();
                this.pack();
@@ -190,9 +195,9 @@ public class SimulationEditDialog extends JDialog {
        }
        
        
-       
-       
-       
+
+
+
        private JPanel flightConditionsTab() {
                JPanel panel = new JPanel(new MigLayout("fill"));
                JPanel sub;
@@ -220,14 +225,14 @@ public class SimulationEditDialog extends JDialog {
                });
                panel.add(combo, "growx, wrap para");
                
-               
+
                //// Wind settings:  Average wind speed, turbulence intensity, std. deviation
                sub = new JPanel(new MigLayout("fill, gap rel unrel",
-                               "[grow][65lp!][30lp!][75lp!]",""));
+                               "[grow][65lp!][30lp!][75lp!]", ""));
                //// Wind
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.lbl.Wind")));
                panel.add(sub, "growx, split 2, aligny 0, flowy, gapright para");
-
+               
 
                // Wind average
                //// Average windspeed:
@@ -237,19 +242,19 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"WindSpeedAverage", UnitGroup.UNITS_VELOCITY,0);
+               m = new DoubleModel(conditions, "WindSpeedAverage", UnitGroup.UNITS_VELOCITY, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(0, 10.0));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
 
@@ -262,22 +267,22 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"WindSpeedDeviation", UnitGroup.UNITS_VELOCITY,0);
-               DoubleModel m2 = new DoubleModel(conditions,"WindSpeedAverage", 0.25, 
-                               UnitGroup.UNITS_COEFFICIENT,0);
+               m = new DoubleModel(conditions, "WindSpeedDeviation", UnitGroup.UNITS_VELOCITY, 0);
+               DoubleModel m2 = new DoubleModel(conditions, "WindSpeedAverage", 0.25,
+                               UnitGroup.UNITS_COEFFICIENT, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(new DoubleModel(0), m2));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
-                               
+               sub.add(slider, "w 75lp, wrap");
+               
 
                // Wind turbulence intensity
                //// Turbulence intensity:
@@ -286,28 +291,28 @@ public class SimulationEditDialog extends JDialog {
                //// Typical values range from 
                //// to
                tip = trans.get("simedtdlg.lbl.ttip.Turbulenceintensity1") +
-                       trans.get("simedtdlg.lbl.ttip.Turbulenceintensity2") + " "+
-                       UnitGroup.UNITS_RELATIVE.getDefaultUnit().toStringUnit(0.05) +
-                       " " + trans.get("simedtdlg.lbl.ttip.Turbulenceintensity3") +" " +
-                       UnitGroup.UNITS_RELATIVE.getDefaultUnit().toStringUnit(0.20) + ".";
+                               trans.get("simedtdlg.lbl.ttip.Turbulenceintensity2") + " " +
+                               UnitGroup.UNITS_RELATIVE.getDefaultUnit().toStringUnit(0.05) +
+                               " " + trans.get("simedtdlg.lbl.ttip.Turbulenceintensity3") + " " +
+                               UnitGroup.UNITS_RELATIVE.getDefaultUnit().toStringUnit(0.20) + ".";
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"WindTurbulenceIntensity", UnitGroup.UNITS_RELATIVE,0);
+               m = new DoubleModel(conditions, "WindTurbulenceIntensity", UnitGroup.UNITS_RELATIVE, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                
                final JLabel intensityLabel = new JLabel(
                                getIntensityDescription(conditions.getWindTurbulenceIntensity()));
                intensityLabel.setToolTipText(tip);
-               sub.add(intensityLabel,"w 75lp, wrap");
+               sub.add(intensityLabel, "w 75lp, wrap");
                m.addChangeListener(new ChangeListener() {
                        @Override
                        public void stateChanged(ChangeEvent e) {
@@ -317,17 +322,17 @@ public class SimulationEditDialog extends JDialog {
                });
                
 
-               
-               
-               
+
+
+
                //// Temperature and pressure
                sub = new JPanel(new MigLayout("fill, gap rel unrel",
-                               "[grow][65lp!][30lp!][75lp!]",""));
+                               "[grow][65lp!][30lp!][75lp!]", ""));
                //// Atmospheric conditions
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Atmoscond")));
                panel.add(sub, "growx, aligny 0, gapright para");
-
                
+
                BooleanModel isa = new BooleanModel(conditions, "ISAAtmosphere");
                JCheckBox check = new JCheckBox(isa);
                //// Use International Standard Atmosphere
@@ -336,8 +341,8 @@ public class SimulationEditDialog extends JDialog {
                //// <br>This model has a temperature of
                //// and a pressure of
                //// at sea level.
-               check.setToolTipText(trans.get("simedtdlg.checkbox.ttip.InterStdAtmosphere1") +" " + 
-                               UnitGroup.UNITS_TEMPERATURE.toStringUnit(ExtendedISAModel.STANDARD_TEMPERATURE)+
+               check.setToolTipText(trans.get("simedtdlg.checkbox.ttip.InterStdAtmosphere1") + " " +
+                               UnitGroup.UNITS_TEMPERATURE.toStringUnit(ExtendedISAModel.STANDARD_TEMPERATURE) +
                                " " + trans.get("simedtdlg.checkbox.ttip.InterStdAtmosphere2") + " " +
                                UnitGroup.UNITS_PRESSURE.toStringUnit(ExtendedISAModel.STANDARD_PRESSURE) +
                                " " + trans.get("simedtdlg.checkbox.ttip.InterStdAtmosphere3"));
@@ -351,25 +356,25 @@ public class SimulationEditDialog extends JDialog {
                isa.addEnableComponent(label, false);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchTemperature", UnitGroup.UNITS_TEMPERATURE,0);
+               m = new DoubleModel(conditions, "LaunchTemperature", UnitGroup.UNITS_TEMPERATURE, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
                isa.addEnableComponent(spin, false);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
                isa.addEnableComponent(unit, false);
-               sub.add(unit,"growx");
-               slider = new BasicSlider(m.getSliderModel(253.15, 308.15));  // -20 ... 35
+               sub.add(unit, "growx");
+               slider = new BasicSlider(m.getSliderModel(253.15, 308.15)); // -20 ... 35
                slider.setToolTipText(tip);
                isa.addEnableComponent(slider, false);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
-               
+
                // Pressure:
                label = new JLabel(trans.get("simedtdlg.lbl.Pressure"));
                //// The atmospheric pressure at the launch site.
@@ -378,35 +383,35 @@ public class SimulationEditDialog extends JDialog {
                isa.addEnableComponent(label, false);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchPressure", UnitGroup.UNITS_PRESSURE,0);
+               m = new DoubleModel(conditions, "LaunchPressure", UnitGroup.UNITS_PRESSURE, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
                isa.addEnableComponent(spin, false);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
                isa.addEnableComponent(unit, false);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(0.950e5, 1.050e5));
                slider.setToolTipText(tip);
                isa.addEnableComponent(slider, false);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
-               
-               
-               
+
+
+
                //// Launch site conditions
                sub = new JPanel(new MigLayout("fill, gap rel unrel",
-                               "[grow][65lp!][30lp!][75lp!]",""));
+                               "[grow][65lp!][30lp!][75lp!]", ""));
                //// Launch site
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.lbl.Launchsite")));
                panel.add(sub, "growx, split 2, aligny 0, flowy");
-
                
+
                // Latitude:
                label = new JLabel(trans.get("simedtdlg.lbl.Latitude"));
                //// <html>The launch site latitude affects the gravitational pull of Earth.<br>
@@ -415,22 +420,42 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchLatitude", UnitGroup.UNITS_NONE, -90, 90);
+               m = new DoubleModel(conditions, "LaunchLatitude", UnitGroup.UNITS_NONE, -90, 90);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                label = new JLabel(Chars.DEGREE + " N");
                label.setToolTipText(tip);
-               sub.add(label,"growx");
+               sub.add(label, "growx");
                slider = new BasicSlider(m.getSliderModel(-90, 90));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
+               // Longitude:
+               label = new JLabel(trans.get("simedtdlg.lbl.Longitude"));
+               tip = trans.get("simedtdlg.lbl.ttip.Longitude");
+               label.setToolTipText(tip);
+               sub.add(label);
+               
+               m = new DoubleModel(conditions, "LaunchLongitude", UnitGroup.UNITS_NONE, -180, 180);
+               
+               spin = new JSpinner(m.getSpinnerModel());
+               spin.setEditor(new SpinnerEditor(spin));
+               spin.setToolTipText(tip);
+               sub.add(spin, "w 65lp!");
+               
+               label = new JLabel(Chars.DEGREE + " E");
+               label.setToolTipText(tip);
+               sub.add(label, "growx");
+               slider = new BasicSlider(m.getSliderModel(-180, 180));
+               slider.setToolTipText(tip);
+               sub.add(slider, "w 75lp, wrap");
                
+
                // Altitude:
                label = new JLabel(trans.get("simedtdlg.lbl.Altitude"));
                //// <html>The launch altitude above mean sea level.<br> 
@@ -439,32 +464,32 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchAltitude", UnitGroup.UNITS_DISTANCE,0);
+               m = new DoubleModel(conditions, "LaunchAltitude", UnitGroup.UNITS_DISTANCE, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(0, 250, 1000));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
-               
 
-               
+
+
                //// Launch rod
                sub = new JPanel(new MigLayout("fill, gap rel unrel",
-                               "[grow][65lp!][30lp!][75lp!]",""));
+                               "[grow][65lp!][30lp!][75lp!]", ""));
                //// Launch rod
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Launchrod")));
                panel.add(sub, "growx, aligny 0, wrap");
-
                
+
                // Length:
                label = new JLabel(trans.get("simedtdlg.lbl.Length"));
                //// The length of the launch rod.
@@ -472,22 +497,22 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchRodLength", UnitGroup.UNITS_LENGTH, 0);
+               m = new DoubleModel(conditions, "LaunchRodLength", UnitGroup.UNITS_LENGTH, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(0, 1, 5));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
-               
+
                // Angle:
                label = new JLabel(trans.get("simedtdlg.lbl.Angle"));
                //// The angle of the launch rod from vertical.
@@ -495,24 +520,24 @@ public class SimulationEditDialog extends JDialog {
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchRodAngle", UnitGroup.UNITS_ANGLE,
+               m = new DoubleModel(conditions, "LaunchRodAngle", UnitGroup.UNITS_ANGLE,
                                0, SimulationOptions.MAX_LAUNCH_ROD_ANGLE);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
-               slider = new BasicSlider(m.getSliderModel(0, Math.PI/9, 
+               sub.add(unit, "growx");
+               slider = new BasicSlider(m.getSliderModel(0, Math.PI / 9,
                                SimulationOptions.MAX_LAUNCH_ROD_ANGLE));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
 
-               
+
                // Direction:
                label = new JLabel(trans.get("simedtdlg.lbl.Direction"));
                //// <html>Direction of the launch rod relative to the wind.<br>
@@ -520,30 +545,30 @@ public class SimulationEditDialog extends JDialog {
                ////  = downwind.
                tip = trans.get("simedtdlg.lbl.ttip.Direction1") +
                                UnitGroup.UNITS_ANGLE.toStringUnit(0) +
-                               " " + trans.get("simedtdlg.lbl.ttip.Direction2") + " "+
+                               " " + trans.get("simedtdlg.lbl.ttip.Direction2") + " " +
                                UnitGroup.UNITS_ANGLE.toStringUnit(Math.PI) +
                                " " + trans.get("simedtdlg.lbl.ttip.Direction3");
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"LaunchRodDirection", UnitGroup.UNITS_ANGLE,
+               m = new DoubleModel(conditions, "LaunchRodDirection", UnitGroup.UNITS_ANGLE,
                                -Math.PI, Math.PI);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "growx");
                slider = new BasicSlider(m.getSliderModel(-Math.PI, Math.PI));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
                
                return panel;
        }
-
+       
        
        private String getIntensityDescription(double i) {
                if (i < 0.001)
@@ -567,115 +592,105 @@ public class SimulationEditDialog extends JDialog {
                //// Extreme
                return trans.get("simedtdlg.IntensityDesc.Extreme");
        }
-
        
        
+
        private JPanel simulationOptionsTab() {
                JPanel panel = new JPanel(new MigLayout("fill"));
-               JPanel sub;
+               JPanel sub, subsub;
                String tip;
                JLabel label;
                DoubleModel m;
                JSpinner spin;
                UnitSelector unit;
                BasicSlider slider;
-
                
+
                //// Simulation options
                sub = new JPanel(new MigLayout("fill, gap rel unrel",
-                               "[grow][65lp!][30lp!][75lp!]",""));
+                               "[grow][65lp!][30lp!][75lp!]", ""));
                //// Simulator options
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Simopt")));
                panel.add(sub, "w 330lp!, growy, aligny 0");
+               
 
+               // Separate panel for computation methods, as they use a different layout
+               subsub = new JPanel(new MigLayout("fill"));
                
-               //  Calculation method
-               //// <html>The Extended Barrowman method calculates aerodynamic forces according <br>
-               //// to the Barrowman equations extended to accommodate more components.
-               tip = trans.get("simedtdlg.lbl.ttip.Calcmethod");
 
                //// Calculation method:
+               tip = trans.get("simedtdlg.lbl.ttip.Calcmethod");
                label = new JLabel(trans.get("simedtdlg.lbl.Calcmethod"));
                label.setToolTipText(tip);
-               sub.add(label, "gaptop unrel, gapright para, spanx, split 2, w 150lp!");
+               subsub.add(label, "gapright para");
                
                //// Extended Barrowman
                label = new JLabel(trans.get("simedtdlg.lbl.ExtBarrowman"));
                label.setToolTipText(tip);
-               sub.add(label, "growx, wrap para");
-               
+               subsub.add(label, "growx, wrap para");
                
+
                //  Simulation method
-               //// <html>The six degree-of-freedom simulator allows the rocket total freedom during flight.<br>
-               //// Integration is performed using a 4<sup>th</sup> order Runge-Kutta 4 numerical integration.
                tip = trans.get("simedtdlg.lbl.ttip.Simmethod1") +
-               trans.get("simedtdlg.lbl.ttip.Simmethod2");
-
-               //// Simulation method:
+                               trans.get("simedtdlg.lbl.ttip.Simmethod2");
                label = new JLabel(trans.get("simedtdlg.lbl.Simmethod"));
                label.setToolTipText(tip);
-               sub.add(label, "gaptop unrel, gapright para, spanx, split 2, w 150lp!");
+               subsub.add(label, "gapright para");
                
                label = new JLabel("6-DOF Runge-Kutta 4");
                label.setToolTipText(tip);
-               sub.add(label, "growx, wrap 35lp");
+               subsub.add(label, "growx, wrap para");
                
+
+               //// Geodetic calculation method:
+               label = new JLabel(trans.get("simedtdlg.lbl.GeodeticMethod"));
+               label.setToolTipText(trans.get("simedtdlg.lbl.ttip.GeodeticMethodTip"));
+               subsub.add(label, "gapright para");
+               
+               EnumModel<GeodeticComputationStrategy> gcsModel = new EnumModel<GeodeticComputationStrategy>(conditions, "GeodeticComputation");
+               final JComboBox gcsCombo = new JComboBox(gcsModel);
+               ActionListener gcsTTipListener = new ActionListener() {
+                       @Override
+                       public void actionPerformed(ActionEvent e) {
+                               GeodeticComputationStrategy gcs = (GeodeticComputationStrategy) gcsCombo.getSelectedItem();
+                               gcsCombo.setToolTipText(gcs.getDescription());
+                       }
+               };
+               gcsCombo.addActionListener(gcsTTipListener);
+               gcsTTipListener.actionPerformed(null);
+               subsub.add(gcsCombo, "growx, wrap para");
                
-               // Wind average
+               sub.add(subsub, "spanx, wrap para");
+               
+
                //// Time step:
                label = new JLabel(trans.get("simedtdlg.lbl.Timestep"));
-               //// <html>The time between simulation steps.<br>
-               //// A smaller time step results in a more accurate but slower simulation.<br>
-               //// The 4<sup>th</sup> order simulation method is quite accurate with a time step of 
                tip = trans.get("simedtdlg.lbl.ttip.Timestep1") +
-               trans.get("simedtdlg.lbl.ttip.Timestep2") + " " +
+                               trans.get("simedtdlg.lbl.ttip.Timestep2") + " " +
                                UnitGroup.UNITS_TIME_STEP.toStringUnit(RK4SimulationStepper.RECOMMENDED_TIME_STEP) +
                                ".";
                label.setToolTipText(tip);
                sub.add(label);
                
-               m = new DoubleModel(conditions,"TimeStep", UnitGroup.UNITS_TIME_STEP, 0, 1);
+               m = new DoubleModel(conditions, "TimeStep", UnitGroup.UNITS_TIME_STEP, 0, 1);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
+               sub.add(spin, "w 65lp!");
+               //sub.add(spin, "nogrid");
                
                unit = new UnitSelector(m);
                unit.setToolTipText(tip);
-               sub.add(unit,"growx");
+               sub.add(unit, "w 25");
+               //sub.add(unit, "nogrid");
                slider = new BasicSlider(m.getSliderModel(0, 0.2));
                slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap");
+               sub.add(slider, "w 75lp, wrap");
+               //sub.add(slider,"wrap");
                
 
 
-               // Maximum angle step
-               /*
-               label = new JLabel("Max. angle step:");
-               tip = "<html>" +
-                               "This defines the maximum angle the rocket will turn during one time step.<br>"+
-                               "Smaller values result in a more accurate but possibly slower simulation.<br>"+
-                               "A recommended value is " +
-                               UnitGroup.UNITS_ANGLE.toStringUnit(RK4Simulator.RECOMMENDED_ANGLE_STEP) + ".";
-               label.setToolTipText(tip);
-               sub.add(label);
-               
-               m = new DoubleModel(conditions,"MaximumStepAngle", UnitGroup.UNITS_ANGLE, 
-                               1*Math.PI/180, Math.PI/9);
-               
-               spin = new JSpinner(m.getSpinnerModel());
-               spin.setEditor(new SpinnerEditor(spin));
-               spin.setToolTipText(tip);
-               sub.add(spin,"w 65lp!");
-               
-               unit = new UnitSelector(m);
-               unit.setToolTipText(tip);
-               sub.add(unit,"growx");
-               slider = new BasicSlider(m.getSliderModel(0, Math.toRadians(10)));
-               slider.setToolTipText(tip);
-               sub.add(slider,"w 75lp, wrap para");
-               */
 
                //// Reset to default button
                JButton button = new JButton(trans.get("simedtdlg.but.resettodefault"));
@@ -687,26 +702,22 @@ public class SimulationEditDialog extends JDialog {
                        @Override
                        public void actionPerformed(ActionEvent e) {
                                conditions.setTimeStep(RK4SimulationStepper.RECOMMENDED_TIME_STEP);
+                               conditions.setGeodeticComputation(GeodeticComputationStrategy.SPHERICAL);
                        }
                });
-                               
-//             button.setToolTipText("<html>Reset the step value to its default:<br>" +
-//                             "Time step " +
-//                             UnitGroup.UNITS_SHORT_TIME.toStringUnit(RK4Simulator.RECOMMENDED_TIME_STEP) +
-//                             "; maximum angle step " +
-//                             UnitGroup.UNITS_ANGLE.toStringUnit(RK4Simulator.RECOMMENDED_ANGLE_STEP) + ".");
-               sub.add(button, "spanx, tag right, wrap para");
-               
-               
                
+               sub.add(button, "align left");
                
+
+
+
                //// Simulation listeners
                sub = new JPanel(new MigLayout("fill, gap 0 0"));
                //// Simulator listeners
                sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Simlist")));
                panel.add(sub, "growx, growy");
                
-               
+
                DescriptionArea desc = new DescriptionArea(5);
                //// <html><i>Simulation listeners</i> is an advanced feature that allows user-written code to listen to and interact with the simulation.  
                //// For details on writing simulation listeners, see the OpenRocket technical documentation.
@@ -717,12 +728,12 @@ public class SimulationEditDialog extends JDialog {
                //// Current listeners:
                label = new JLabel(trans.get("simedtdlg.lbl.Curlist"));
                sub.add(label, "spanx, wrap rel");
-
+               
                final ListenerListModel listenerModel = new ListenerListModel();
                final JList list = new JList(listenerModel);
                list.setCellRenderer(new ListenerCellRenderer());
                JScrollPane scroll = new JScrollPane(list);
-//             scroll.setPreferredSize(new Dimension(1,1));
+               //              scroll.setPreferredSize(new Dimension(1,1));
                sub.add(scroll, "height 1px, grow, wrap rel");
                
                //// Add button
@@ -731,20 +742,20 @@ public class SimulationEditDialog extends JDialog {
                        @Override
                        public void actionPerformed(ActionEvent e) {
                                String previous = Prefs.NODE.get("previousListenerName", "");
-                               String input = (String)JOptionPane.showInputDialog(SimulationEditDialog.this,
+                               String input = (String) JOptionPane.showInputDialog(SimulationEditDialog.this,
                                                new Object[] {
-                                               //// Type the full Java class name of the simulation listener, for example:
-                                               "Type the full Java class name of the simulation listener, for example:",
-                                               "<html><tt>" + CSVSaveListener.class.getName() + "</tt>" },
+                                                               //// Type the full Java class name of the simulation listener, for example:
+                                                               "Type the full Java class name of the simulation listener, for example:",
+                                                               "<html><tt>" + CSVSaveListener.class.getName() + "</tt>" },
                                                //// Add simulation listener
                                                trans.get("simedtdlg.lbl.Addsimlist"),
                                                JOptionPane.QUESTION_MESSAGE,
                                                null, null,
                                                previous
-                               );
+                                               );
                                if (input == null || input.equals(""))
                                        return;
-
+                               
                                Prefs.NODE.put("previousListenerName", input);
                                simulation.getSimulationListeners().add(input);
                                listenerModel.fireContentsChanged();
@@ -759,7 +770,7 @@ public class SimulationEditDialog extends JDialog {
                        public void actionPerformed(ActionEvent e) {
                                int[] selected = list.getSelectedIndices();
                                Arrays.sort(selected);
-                               for (int i=selected.length-1; i>=0; i--) {
+                               for (int i = selected.length - 1; i >= 0; i--) {
                                        simulation.getSimulationListeners().remove(selected[i]);
                                }
                                listenerModel.fireContentsChanged();
@@ -770,8 +781,8 @@ public class SimulationEditDialog extends JDialog {
 
                return panel;
        }
-
-
+       
+       
        private class ListenerListModel extends AbstractListModel {
                @Override
                public String getElementAt(int index) {
@@ -779,25 +790,27 @@ public class SimulationEditDialog extends JDialog {
                                return null;
                        return simulation.getSimulationListeners().get(index);
                }
+               
                @Override
                public int getSize() {
                        return simulation.getSimulationListeners().size();
                }
+               
                public void fireContentsChanged() {
                        super.fireContentsChanged(this, 0, getSize());
                }
        }
        
        
-       
-       
+
+
        /**
         * A panel for plotting the previously calculated data.
         */
        private JPanel plotTab() {
-
+               
                // Check that data exists
-               if (simulation.getSimulatedData() == null  ||
+               if (simulation.getSimulatedData() == null ||
                                simulation.getSimulatedData().getBranchCount() == 0) {
                        return noDataPanel();
                }
@@ -806,15 +819,15 @@ public class SimulationEditDialog extends JDialog {
        }
        
        
-       
+
        /**
         * A panel for exporting the data.
         */
        private JPanel exportTab() {
                FlightData data = simulation.getSimulatedData();
-
+               
                // Check that data exists
-               if (data == null  || data.getBranchCount() == 0 ||
+               if (data == null || data.getBranchCount() == 0 ||
                                data.getBranch(0).getTypes().length == 0) {
                        return noDataPanel();
                }
@@ -823,8 +836,8 @@ public class SimulationEditDialog extends JDialog {
        }
        
        
-       
-       
+
+
 
        /**
         * Return a panel stating that there is no data available, and that the user
@@ -836,28 +849,28 @@ public class SimulationEditDialog extends JDialog {
                // No data available
                //// No flight data available.
                panel.add(new JLabel(trans.get("simedtdlg.lbl.Noflightdata")),
-               "alignx 50%, aligny 100%, wrap para");
+                               "alignx 50%, aligny 100%, wrap para");
                //// Please run the simulation first.
                panel.add(new JLabel(trans.get("simedtdlg.lbl.runsimfirst")),
-               "alignx 50%, aligny 0%, wrap");
+                               "alignx 50%, aligny 0%, wrap");
                return panel;
        }
        
-
+       
        private void performPlot(PlotConfiguration config) {
-
+               
                // Fill the auto-selections
                FlightDataBranch branch = simulation.getSimulatedData().getBranch(0);
                PlotConfiguration filled = config.fillAutoAxes(branch);
                List<Axis> axes = filled.getAllAxes();
-
+               
 
                // Create the data series for both axes
                XYSeriesCollection[] data = new XYSeriesCollection[2];
                data[0] = new XYSeriesCollection();
                data[1] = new XYSeriesCollection();
                
-               
+
                // Get the domain axis type
                final FlightDataType domainType = filled.getDomainAxisType();
                final Unit domainUnit = filled.getDomainAxisUnit();
@@ -865,8 +878,8 @@ public class SimulationEditDialog extends JDialog {
                        throw new IllegalArgumentException("Domain axis type not specified.");
                }
                List<Double> x = branch.get(domainType);
-
                
+
                // Create the XYSeries objects from the flight data and store into the collections
                int length = filled.getTypeCount();
                String[] axisLabel = new String[2];
@@ -880,11 +893,11 @@ public class SimulationEditDialog extends JDialog {
                        // Store data in provided units
                        List<Double> y = branch.get(type);
                        XYSeries series = new XYSeries(name, false, true);
-                       for (int j=0; j<x.size(); j++) {
+                       for (int j = 0; j < x.size(); j++) {
                                series.add(domainUnit.toUnit(x.get(j)), unit.toUnit(y.get(j)));
                        }
                        data[axis].addSeries(series);
-
+                       
                        // Update axis label
                        if (axisLabel[axis] == null)
                                axisLabel[axis] = type.getName();
@@ -892,25 +905,25 @@ public class SimulationEditDialog extends JDialog {
                                axisLabel[axis] += "; " + type.getName();
                }
                
-               
+
                // Create the chart using the factory to get all default settings
-        JFreeChart chart = ChartFactory.createXYLineChart(
-            //// Simulated flight
-               trans.get("simedtdlg.chart.Simflight"),
-            null, 
-            null, 
-            null,
-            PlotOrientation.VERTICAL,
-            true,
-            true,
-            false
-        );
-               
-        
+               JFreeChart chart = ChartFactory.createXYLineChart(
+                               //// Simulated flight
+                               trans.get("simedtdlg.chart.Simflight"),
+                               null,
+                               null,
+                               null,
+                               PlotOrientation.VERTICAL,
+                               true,
+                               true,
+                               false
+                               );
+               
+
                // Add the data and formatting to the plot
                XYPlot plot = chart.getXYPlot();
                int axisno = 0;
-               for (int i=0; i<2; i++) {
+               for (int i = 0; i < 2; i++) {
                        // Check whether axis has any data
                        if (data[i].getSeriesCount() > 0) {
                                // Create and set axis
@@ -918,7 +931,7 @@ public class SimulationEditDialog extends JDialog {
                                double max = axes.get(i).getMaxValue();
                                NumberAxis axis = new PresetNumberAxis(min, max);
                                axis.setLabel(axisLabel[i]);
-//                             axis.setRange(axes.get(i).getMinValue(), axes.get(i).getMaxValue());
+                               //                              axis.setRange(axes.get(i).getMinValue(), axes.get(i).getMaxValue());
                                plot.setRangeAxis(axisno, axis);
                                
                                // Add data and map to the axis
@@ -929,11 +942,11 @@ public class SimulationEditDialog extends JDialog {
                        }
                }
                
-               plot.getDomainAxis().setLabel(getLabel(domainType,domainUnit));
+               plot.getDomainAxis().setLabel(getLabel(domainType, domainUnit));
                plot.addDomainMarker(new ValueMarker(0));
                plot.addRangeMarker(new ValueMarker(0));
                
-               
+
                // Create the dialog
                //// Simulation results
                final JDialog dialog = new JDialog(this, trans.get("simedtdlg.dlg.Simres"));
@@ -944,9 +957,9 @@ public class SimulationEditDialog extends JDialog {
                
                ChartPanel chartPanel = new ChartPanel(chart,
                                false, // properties
-                               true,  // save
+                               true, // save
                                false, // print
-                               true,  // zoom
+                               true, // zoom
                                true); // tooltips
                chartPanel.setMouseWheelEnabled(true);
                chartPanel.setEnforceFileExtensions(true);
@@ -955,7 +968,7 @@ public class SimulationEditDialog extends JDialog {
                chartPanel.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1));
                
                panel.add(chartPanel, "grow, wrap 20lp");
-
+               
                //// Close button
                JButton button = new JButton(trans.get("dlg.but.close"));
                button.addActionListener(new ActionListener() {
@@ -965,15 +978,15 @@ public class SimulationEditDialog extends JDialog {
                        }
                });
                panel.add(button, "right");
-
+               
                dialog.setLocationByPlatform(true);
                dialog.pack();
                
                GUIUtil.setDisposableDialogOptions(dialog, button);
-
+               
                dialog.setVisible(true);
        }
-
+       
        
        private class PresetNumberAxis extends NumberAxis {
                private final double min;
@@ -994,31 +1007,32 @@ public class SimulationEditDialog extends JDialog {
        
        private String getLabel(FlightDataType type, Unit unit) {
                String name = type.getName();
-               if (unit != null  &&  !UnitGroup.UNITS_NONE.contains(unit)  &&
+               if (unit != null && !UnitGroup.UNITS_NONE.contains(unit) &&
                                !UnitGroup.UNITS_COEFFICIENT.contains(unit) && unit.getUnit().length() > 0)
-                       name += " ("+unit.getUnit() + ")";
+                       name += " (" + unit.getUnit() + ")";
                return name;
        }
        
-
+       
 
        private class ListenerCellRenderer extends JLabel implements ListCellRenderer {
-
+               
+               @Override
                public Component getListCellRendererComponent(JList list, Object value,
                                int index, boolean isSelected, boolean cellHasFocus) {
                        String s = value.toString();
                        setText(s);
-
+                       
                        // Attempt instantiating, catch any exceptions
                        Exception ex = null;
                        try {
                                Class<?> c = Class.forName(s);
                                @SuppressWarnings("unused")
-                               SimulationListener l = (SimulationListener)c.newInstance();
+                               SimulationListener l = (SimulationListener) c.newInstance();
                        } catch (Exception e) {
                                ex = e;
                        }
-
+                       
                        if (ex == null) {
                                setIcon(Icons.SIMULATION_LISTENER_OK);
                                //// Listener instantiated successfully.
@@ -1029,7 +1043,7 @@ public class SimulationEditDialog extends JDialog {
                                setToolTipText("<html>Unable to instantiate listener due to exception:<br>" +
                                                ex.toString());
                        }
-
+                       
                        if (isSelected) {
                                setBackground(list.getSelectionBackground());
                                setForeground(list.getSelectionForeground());