From 7d95a369071d99ac97fdd348ac6e7906f6b9bf35 Mon Sep 17 00:00:00 2001
From: Craig Earls <enderw88@gmail.com>
Date: Thu, 25 Dec 2014 23:09:23 -0800
Subject: [PATCH] Moved wind direction below wind turbulence intensity.

---
 .../preferences/LaunchPreferencesPanel.java   | 43 ++++++++++---------
 .../simulation/SimulationConditionsPanel.java | 42 +++++++++---------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
index 5553737ca..d6c990aa7 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
@@ -98,27 +98,6 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
 		slider.setToolTipText(tip);
 		sub.add(slider, "w 75lp, wrap");
 
-		// Wind Direction:
-		label = new JLabel(trans.get("simedtdlg.lbl.Winddirection"));
-		// // Direction of the wind. 0 is north
-		tip = trans.get("simedtdlg.lbl.ttip.Winddirection");
-		label.setToolTipText(tip);
-		sub.add(label);
-
-		m = new DoubleModel(preferences, "WindDirection", 1.0,
-				UnitGroup.UNITS_ANGLE, 0, 2 * Math.PI);
-
-		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, 2 * Math.PI));
-		slider.setToolTipText(tip);
-		sub.add(slider, "w 75lp, wrap");
 
 		// Wind turbulence intensity
 		// // Turbulence intensity:
@@ -162,6 +141,28 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
 			}
 		});
 
+		// Wind Direction:
+		label = new JLabel(trans.get("simedtdlg.lbl.Winddirection"));
+		// // Direction of the wind. 0 is north
+		tip = trans.get("simedtdlg.lbl.ttip.Winddirection");
+		label.setToolTipText(tip);
+		sub.add(label);
+
+		m = new DoubleModel(preferences, "WindDirection", 1.0,
+				UnitGroup.UNITS_ANGLE, 0, 2 * Math.PI);
+
+		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, 2 * Math.PI));
+		slider.setToolTipText(tip);
+		sub.add(slider, "w 75lp, wrap");
+
 		// // Temperature and pressure
 		sub = new JPanel(new MigLayout("fill, gap rel unrel",
 				"[grow][65lp!][30lp!][75lp!]", ""));
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
index 67c033426..ef355df17 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
@@ -100,27 +100,6 @@ public class SimulationConditionsPanel extends JPanel {
 		slider.setToolTipText(tip);
 		sub.add(slider, "w 75lp, wrap");
 		
-		// Wind Direction:
-		label = new JLabel(trans.get("simedtdlg.lbl.Winddirection"));
-		//// Direction of the wind. 0 is north
-		tip = trans.get("simedtdlg.lbl.ttip.Winddirection");
-		label.setToolTipText(tip);
-		sub.add(label);
-		
-		m = new DoubleModel(conditions, "WindDirection", 1.0, UnitGroup.UNITS_ANGLE,
-				0, 2*Math.PI);
-					
-		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, 2*Math.PI));
-		slider.setToolTipText(tip);
-		sub.add(slider, "w 75lp, wrap");
 			
 		
 		
@@ -162,6 +141,27 @@ public class SimulationConditionsPanel extends JPanel {
 			}
 		});
 		
+		// Wind Direction:
+		label = new JLabel(trans.get("simedtdlg.lbl.Winddirection"));
+		//// Direction of the wind. 0 is north
+		tip = trans.get("simedtdlg.lbl.ttip.Winddirection");
+		label.setToolTipText(tip);
+		sub.add(label);
+		
+		m = new DoubleModel(conditions, "WindDirection", 1.0, UnitGroup.UNITS_ANGLE,
+				0, 2*Math.PI);
+					
+		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, 2*Math.PI));
+		slider.setToolTipText(tip);
+		sub.add(slider, "w 75lp, wrap");