X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FTransitionConfig.java;h=5e0286d8946447a450e048caba95730bd48a4ed1;hb=bae4608a5d01ff84ac6d020c0c47931d2e243250;hp=c512d4dd6c6179fa1b9b28da47efac22584f60d7;hpb=00ede5818b7bb30df3864d9e5248d679e7ea9c26;p=debian%2Fopenrocket diff --git a/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java index c512d4dd..5e0286d8 100644 --- a/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java +++ b/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java @@ -11,6 +11,7 @@ import javax.swing.JPanel; import javax.swing.JSpinner; import net.miginfocom.swing.MigLayout; +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; @@ -25,7 +26,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; public class TransitionConfig extends RocketComponentConfig { - + private static final Translator trans = Application.getTranslator(); private JComboBox typeBox; //private JLabel description; @@ -40,168 +41,169 @@ public class TransitionConfig extends RocketComponentConfig { private static final String PREDESC = ""; - public TransitionConfig(RocketComponent c) { - super(c); + public TransitionConfig(OpenRocketDocument d, RocketComponent c) { + super(d, c); DoubleModel m; JSpinner spin; JCheckBox checkbox; - - JPanel panel = new JPanel(new MigLayout("gap rel unrel","[][65lp::][30lp::]","")); + + JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", "")); //// Shape selection //// Transition shape: panel.add(new JLabel(trans.get("TransitionCfg.lbl.Transitionshape"))); - - Transition.Shape selected = ((Transition)component).getType(); + + Transition.Shape selected = ((Transition) component).getType(); Transition.Shape[] typeList = Transition.Shape.values(); typeBox = new JComboBox(typeList); typeBox.setEditable(false); typeBox.setSelectedItem(selected); typeBox.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - Transition.Shape s = (Transition.Shape)typeBox.getSelectedItem(); - ((Transition)component).setType(s); + Transition.Shape s = (Transition.Shape) typeBox.getSelectedItem(); + ((Transition) component).setType(s); description.setText(PREDESC + s.getTransitionDescription()); updateEnabled(); } }); - panel.add(typeBox,"span, split 2"); - + panel.add(typeBox, "span, split 2"); + //// Clipped - checkbox = new JCheckBox(new BooleanModel(component,trans.get("TransitionCfg.checkbox.Clipped"))); + checkbox = new JCheckBox(new BooleanModel(component, "Clipped")); //// Clipped checkbox.setText(trans.get("TransitionCfg.checkbox.Clipped")); - panel.add(checkbox,"wrap"); - + panel.add(checkbox, "wrap"); + //// Shape parameter: shapeLabel = new JLabel(trans.get("TransitionCfg.lbl.Shapeparam")); panel.add(shapeLabel); - m = new DoubleModel(component,"ShapeParameter"); + m = new DoubleModel(component, "ShapeParameter"); shapeSpinner = new JSpinner(m.getSpinnerModel()); shapeSpinner.setEditor(new SpinnerEditor(shapeSpinner)); - panel.add(shapeSpinner,"growx"); + panel.add(shapeSpinner, "growx"); - DoubleModel min = new DoubleModel(component,"ShapeParameterMin"); - DoubleModel max = new DoubleModel(component,"ShapeParameterMax"); - shapeSlider = new BasicSlider(m.getSliderModel(min,max)); - panel.add(shapeSlider,"skip, w 100lp, wrap"); + DoubleModel min = new DoubleModel(component, "ShapeParameterMin"); + DoubleModel max = new DoubleModel(component, "ShapeParameterMax"); + shapeSlider = new BasicSlider(m.getSliderModel(min, max)); + panel.add(shapeSlider, "skip, w 100lp, wrap"); updateEnabled(); - + //// Length //// Transition length: panel.add(new JLabel(trans.get("TransitionCfg.lbl.Transitionlength"))); - m = new DoubleModel(component,"Length",UnitGroup.UNITS_LENGTH,0); + m = new DoubleModel(component, "Length", 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(0, 0.05, 0.3)),"w 100lp, wrap"); + panel.add(spin, "growx"); + panel.add(new UnitSelector(m), "growx"); + panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.3)), "w 100lp, wrap"); + //// Transition diameter 1 //// Fore diameter: panel.add(new JLabel(trans.get("TransitionCfg.lbl.Forediam"))); - - DoubleModel od = new DoubleModel(component,"ForeRadius",2,UnitGroup.UNITS_LENGTH,0); + + DoubleModel od = new DoubleModel(component, "ForeRadius", 2, UnitGroup.UNITS_LENGTH, 0); // Diameter = 2*Radius - + spin = new JSpinner(od.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); - panel.add(spin,"growx"); + panel.add(spin, "growx"); + + panel.add(new UnitSelector(od), "growx"); + panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px"); - panel.add(new UnitSelector(od),"growx"); - panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)),"w 100lp, wrap 0px"); - checkbox = new JCheckBox(od.getAutomaticAction()); //// Automatic checkbox.setText(trans.get("TransitionCfg.checkbox.Automatic")); - panel.add(checkbox,"skip, span 2, wrap"); - + panel.add(checkbox, "skip, span 2, wrap"); + //// Transition diameter 2 //// Aft diameter: panel.add(new JLabel(trans.get("TransitionCfg.lbl.Aftdiam"))); - - od = new DoubleModel(component,"AftRadius",2,UnitGroup.UNITS_LENGTH,0); + + od = new DoubleModel(component, "AftRadius", 2, UnitGroup.UNITS_LENGTH, 0); // Diameter = 2*Radius - + spin = new JSpinner(od.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); - panel.add(spin,"growx"); + panel.add(spin, "growx"); + + panel.add(new UnitSelector(od), "growx"); + panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px"); - panel.add(new UnitSelector(od),"growx"); - panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)),"w 100lp, wrap 0px"); - checkbox = new JCheckBox(od.getAutomaticAction()); //// Automatic checkbox.setText(trans.get("TransitionCfg.checkbox.Automatic")); - panel.add(checkbox,"skip, span 2, wrap"); - + panel.add(checkbox, "skip, span 2, wrap"); + //// Wall thickness: panel.add(new JLabel(trans.get("TransitionCfg.lbl.Wallthickness"))); - m = new DoubleModel(component,"Thickness",UnitGroup.UNITS_LENGTH,0); + m = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0); spin = new JSpinner(m.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); - panel.add(spin,"growx"); + panel.add(spin, "growx"); - panel.add(new UnitSelector(m),"growx"); - panel.add(new BasicSlider(m.getSliderModel(0,0.01)),"w 100lp, wrap 0px"); + panel.add(new UnitSelector(m), "growx"); + panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 0px"); //// Filled - checkbox = new JCheckBox(new BooleanModel(component,trans.get("TransitionCfg.checkbox.Filled"))); + checkbox = new JCheckBox(new BooleanModel(component, "Filled")); //// Filled checkbox.setText(trans.get("TransitionCfg.checkbox.Filled")); - panel.add(checkbox,"skip, span 2, wrap"); - - + panel.add(checkbox, "skip, span 2, wrap"); + + //// Description JPanel panel2 = new JPanel(new MigLayout("ins 0")); description = new DescriptionArea(5); - description.setText(PREDESC + ((Transition)component).getType(). + description.setText(PREDESC + ((Transition) component).getType(). getTransitionDescription()); panel2.add(description, "wmin 250lp, spanx, growx, wrap para"); //// Material - + materialPanel(panel2, Material.Type.BULK); panel.add(panel2, "cell 4 0, gapleft paragraph, aligny 0%, spany"); //// General and General properties - tabbedPane.insertTab(trans.get("TransitionCfg.tab.General"), null, panel, + tabbedPane.insertTab(trans.get("TransitionCfg.tab.General"), null, panel, trans.get("TransitionCfg.tab.Generalproperties"), 0); //// Shoulder and Shoulder properties - tabbedPane.insertTab(trans.get("TransitionCfg.tab.Shoulder"), null, shoulderTab(), + tabbedPane.insertTab(trans.get("TransitionCfg.tab.Shoulder"), null, shoulderTab(), trans.get("TransitionCfg.tab.Shoulderproperties"), 1); tabbedPane.setSelectedIndex(0); } - + private void updateEnabled() { - boolean e = ((Transition)component).getType().usesParameter(); + boolean e = ((Transition) component).getType().usesParameter(); shapeLabel.setEnabled(e); shapeSpinner.setEnabled(e); shapeSlider.setEnabled(e); } - + }