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

Moved wind direction below wind turbulence intensity.

Browse Source
This commit is contained in:
Craig Earls 2014-12-25 23:09:23 -08:00
parent ba2590ee04
commit 7d95a36907
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
View File

@ -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!]", ""));

42
swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
View File

@ -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");