Updates and fixed to preset handling

[debian/openrocket] / core / src / net / sf / openrocket / gui / configdialog / BodyTubeConfig.java

diff --git a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
index af272a0d88b50a2f6836ef6874b42d12e4cac5a1..190b496899c74409b00d0405c3f014201a7e82c7 100644 (file)
--- a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
+++ b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
@@ -2,6 +2,7 @@ package net.sf.openrocket.gui.configdialog;
 
 
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSpinner;
@@ -11,6 +12,7 @@ import net.sf.openrocket.document.OpenRocketDocument;
 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.PresetModel;
 import net.sf.openrocket.gui.components.BasicSlider;
 import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.l10n.Translator;
@@ -23,6 +25,8 @@ import net.sf.openrocket.unit.UnitGroup;
 public class BodyTubeConfig extends RocketComponentConfig {
        
        private MotorConfig motorConfigPane = null;
+       private DoubleModel maxLength;
+       private JComboBox presetComboBox;
        private static final Translator trans = Application.getTranslator();
        
        public BodyTubeConfig(OpenRocketDocument d, RocketComponent c) {
@@ -30,19 +34,31 @@ public class BodyTubeConfig extends RocketComponentConfig {
                
                JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
                
+               
+               
+               ////  Body tube template
+               // FIXME: Move to proper location
+               panel.add(new JLabel());
+               presetComboBox = new JComboBox(new PresetModel(component));
+               presetComboBox.setEditable(false);
+               panel.add(presetComboBox, "wrap para");
+               
+               
+               
                ////  Body tube length
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Bodytubelength")));
                
-               DoubleModel m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
+               maxLength = new DoubleModel(2.0);
+               DoubleModel length = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
                
-               JSpinner spin = new JSpinner(m.getSpinnerModel());
+               JSpinner spin = new JSpinner(length.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                panel.add(spin, "growx");
                
-               panel.add(new UnitSelector(m), "growx");
-               panel.add(new BasicSlider(m.getSliderModel(0, 0.5, 2.0)), "w 100lp, wrap");
+               panel.add(new UnitSelector(length), "growx");
+               panel.add(new BasicSlider(length.getSliderModel(0, 0.5, maxLength)), "w 100lp, wrap");
+               
                
-
                //// Body tube diameter
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Outerdiameter")));
                
@@ -61,14 +77,14 @@ public class BodyTubeConfig extends RocketComponentConfig {
                check.setText(trans.get("BodyTubecfg.checkbox.Automatic"));
                panel.add(check, "skip, span 2, wrap");
                
-
+               
                ////  Inner diameter
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Innerdiameter")));
                
                // Diameter = 2*Radius
-               m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
+               DoubleModel m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
+               
                
-
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                panel.add(spin, "growx");
@@ -76,7 +92,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                panel.add(new UnitSelector(m), "growx");
                panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap");
                
-
+               
                ////  Wall thickness
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Wallthickness")));
                
@@ -94,7 +110,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                check.setText(trans.get("BodyTubecfg.checkbox.Filled"));
                panel.add(check, "skip, span 2, wrap");
                
-
+               
                //// Material
                panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
                                "cell 4 0, gapleft paragraph, aligny 0%, spany");
@@ -107,6 +123,8 @@ public class BodyTubeConfig extends RocketComponentConfig {
                tabbedPane.insertTab(trans.get("BodyTubecfg.tab.Motor"), null, motorConfigPane,
                                trans.get("BodyTubecfg.tab.Motormountconf"), 1);
                tabbedPane.setSelectedIndex(0);
+               
+               
        }
        
        @Override
@@ -116,4 +134,6 @@ public class BodyTubeConfig extends RocketComponentConfig {
                        motorConfigPane.updateFields();
        }
        
+       
+       
 }