updates for 0.9.4

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

diff --git a/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
index fb8e76cce77fd07f504b20a408e46a0081d0e2d7..efec1267965f97a6aa2ffaf6d8f10a9c88dc07c9 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
@@ -4,11 +4,22 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
 import javax.swing.SwingUtilities;
 
+import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.gui.SpinnerEditor;
+import net.sf.openrocket.gui.adaptors.DoubleModel;
+import net.sf.openrocket.gui.adaptors.EnumModel;
+import net.sf.openrocket.gui.components.BasicSlider;
+import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.rocketcomponent.FinSet;
 import net.sf.openrocket.rocketcomponent.FreeformFinSet;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.unit.UnitGroup;
 
 
 public abstract class FinSetConfig extends RocketComponentConfig {
@@ -17,6 +28,8 @@ public abstract class FinSetConfig extends RocketComponentConfig {
        
        public FinSetConfig(RocketComponent component) {
                super(component);
+               
+               tabbedPane.insertTab("Fin tabs", null, finTabPanel(), "Through-the-wall fin tabs", 0);
        }
 
        
@@ -35,20 +48,9 @@ public abstract class FinSetConfig extends RocketComponentConfig {
                                        SwingUtilities.invokeLater(new Runnable() {
                                                @Override
                                                public void run() {
-                                                       FreeformFinSet freeform = new FreeformFinSet((FinSet)component);
-                                                       String name = component.getComponentName();
-                                                       
-                                                       if (freeform.getName().startsWith(name)) {
-                                                               freeform.setName(freeform.getComponentName() + 
-                                                                               freeform.getName().substring(name.length()));
-                                                       }
-                                                       
-                                                       RocketComponent parent = component.getParent();
-                                                       int index = parent.getChildPosition(component);
-
                                                        ComponentConfigDialog.addUndoPosition("Convert fin set");
-                                                       parent.removeChild(index);
-                                                       parent.addChild(freeform, index);
+                                                       RocketComponent freeform = 
+                                                               FreeformFinSet.convertFinSet((FinSet)component);
                                                        ComponentConfigDialog.showDialog(freeform);
                                                }
                                        });
@@ -98,6 +100,84 @@ public abstract class FinSetConfig extends RocketComponentConfig {
 
        }
 
+       public JPanel finTabPanel() {
+               JPanel panel = new JPanel(
+                               new MigLayout("align 50% 20%, fillx, gap rel unrel, ins 20lp 10% 20lp 10%",
+                               "[150lp::][65lp::][30lp::][200lp::]",""));
+//             JPanel panel = new JPanel(new MigLayout("fillx, align 20% 20%, gap rel unrel",
+//                             "[40lp][80lp::][30lp::][100lp::]",""));
+
+               panel.add(new JLabel("<html><b>Through-the-wall fin tabs:</b>"), "spanx, wrap 30lp");
+               
+               JLabel label;
+               DoubleModel m;
+               DoubleModel length;
+               DoubleModel length2;
+               DoubleModel length_2;
+               JSpinner spin;
+
+               length = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
+               length2 = new DoubleModel(component, "Length", 0.5, UnitGroup.UNITS_LENGTH, 0);
+               length_2 = new DoubleModel(component, "Length", -0.5, UnitGroup.UNITS_LENGTH, 0);
+               
+               ////  Tab length
+               label = new JLabel("Tab length:");
+               label.setToolTipText("The length of the fin tab.");
+               panel.add(label, "gapleft para, gapright 40lp, growx 1");
+               
+               m = new DoubleModel(component, "TabLength", UnitGroup.UNITS_LENGTH, 0);
+               
+               spin = new JSpinner(m.getSpinnerModel());
+               spin.setEditor(new SpinnerEditor(spin));
+               panel.add(spin,"growx 1");
+               
+               panel.add(new UnitSelector(m),"growx 1");
+               panel.add(new BasicSlider(m.getSliderModel(DoubleModel.ZERO, length)),
+                               "w 100lp, growx 5, wrap");
+
+               
+               ////  Tab length
+               label = new JLabel("Tab height:");
+               label.setToolTipText("The spanwise height of the fin tab.");
+               panel.add(label, "gapleft para");
+               
+               m = new DoubleModel(component, "TabHeight", UnitGroup.UNITS_LENGTH, 0);
+               
+               spin = new JSpinner(m.getSpinnerModel());
+               spin.setEditor(new SpinnerEditor(spin));
+               panel.add(spin,"growx");
+               
+               panel.add(new UnitSelector(m),"growx");
+               panel.add(new BasicSlider(m.getSliderModel(DoubleModel.ZERO, length2)),
+                               "w 100lp, growx 5, wrap para");
+
+               
+               ////  Tab position
+               label = new JLabel("Tab position:");
+               label.setToolTipText("The position of the fin tab.");
+               panel.add(label, "gapleft para");
+               
+               m = new DoubleModel(component, "TabShift", UnitGroup.UNITS_LENGTH);
+               
+               spin = new JSpinner(m.getSpinnerModel());
+               spin.setEditor(new SpinnerEditor(spin));
+               panel.add(spin,"growx");
+               
+               panel.add(new UnitSelector(m),"growx");
+               panel.add(new BasicSlider(m.getSliderModel(length_2, length2)),"w 100lp, growx 5, wrap");
+
+               
+               
+               label = new JLabel("relative to");
+               panel.add(label, "right, gapright unrel");
+               
+               EnumModel<FinSet.TabRelativePosition> em = 
+                       new EnumModel<FinSet.TabRelativePosition>(component, "TabRelativePosition");
+               
+               panel.add(new JComboBox(em), "spanx 3, growx");
+               
+               return panel;
+       }
 
        @Override
        public void updateFields() {