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

Switch places of CD and material

Browse Source
This commit is contained in:
Sampo Niskanen 2012-03-17 19:54:46 +00:00
parent 47b5d86268
commit 7de583e459
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
View File

@ -56,21 +56,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.4, 1.5)), "w 100lp, wrap"); panel.add(new BasicSlider(m.getSliderModel(0, 0.4, 1.5)), "w 100lp, wrap");
//// Material:
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Material")));
JComboBox combo = new JComboBox(new MaterialModel(panel, component,
Material.Type.SURFACE));
//// The component material affects the weight of the component.
combo.setToolTipText(trans.get("ParachuteCfg.combo.MaterialModel"));
panel.add(combo, "spanx 3, growx, wrap paragraph");
// materialPanel(panel, Material.Type.SURFACE, "Material:", null);
// CD // CD
//// <html>Drag coefficient C<sub>D</sub>:
JLabel label = new HtmlLabel(trans.get("ParachuteCfg.lbl.longA1")); JLabel label = new HtmlLabel(trans.get("ParachuteCfg.lbl.longA1"));
String tip = trans.get("ParachuteCfg.lbl.longB1") + String tip = trans.get("ParachuteCfg.lbl.longB1") +
trans.get("ParachuteCfg.lbl.longB2") + " " + trans.get("ParachuteCfg.lbl.longB2") + " " +
@ -94,7 +80,16 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
p.setCD(Parachute.DEFAULT_CD); p.setCD(Parachute.DEFAULT_CD);
} }
}); });
panel.add(button, "spanx, wrap 30lp"); panel.add(button, "spanx, wrap para");
//// Material:
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Material")));
JComboBox combo = new JComboBox(new MaterialModel(panel, component,
Material.Type.SURFACE));
combo.setToolTipText(trans.get("ParachuteCfg.combo.MaterialModel"));
panel.add(combo, "spanx 3, growx, wrap 30lp");