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

Merge pull request #2156 from SiboVG/issue-2142

Browse Source 
[#2142] Set length setting as first item
This commit is contained in:
Sibo Van Gool 2023-03-30 16:34:48 +02:00 committed by GitHub
commit 71083f1721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
View File

@ -21,8 +21,7 @@ public class BulkheadConfig extends RingComponentConfig {
JPanel tab; JPanel tab;
tab = generalTab(trans.get("BulkheadCfg.tab.Diameter"), null, null, tab = generalTab(trans.get("BulkheadCfg.tab.Thickness"), trans.get("BulkheadCfg.tab.Diameter"), null, null);
trans.get("BulkheadCfg.tab.Thickness"));
//// General and General properties //// General and General properties
tabbedPane.insertTab(trans.get("BulkheadCfg.tab.General"), null, tab, tabbedPane.insertTab(trans.get("BulkheadCfg.tab.General"), null, tab,
trans.get("BulkheadCfg.tab.Generalproperties"), 0); trans.get("BulkheadCfg.tab.Generalproperties"), 0);

5
swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
View File

@ -22,9 +22,8 @@ public class CenteringRingConfig extends RingComponentConfig {
JPanel tab; JPanel tab;
//// Outer diameter: and Inner diameter: and Thickness: //// Outer diameter: and Inner diameter: and Thickness:
tab = generalTab(trans.get("CenteringRingCfg.tab.Outerdiam"), tab = generalTab(trans.get("CenteringRingCfg.tab.Thickness"), trans.get("CenteringRingCfg.tab.Outerdiam"),
trans.get("CenteringRingCfg.tab.Innerdiam"), null, trans.get("CenteringRingCfg.tab.Innerdiam"), null);
trans.get("CenteringRingCfg.tab.Thickness"));
//// General and General properties //// General and General properties
tabbedPane.insertTab(trans.get("CenteringRingCfg.tab.General"), null, tab, tabbedPane.insertTab(trans.get("CenteringRingCfg.tab.General"), null, tab,
trans.get("CenteringRingCfg.tab.Generalproperties"), 0); trans.get("CenteringRingCfg.tab.Generalproperties"), 0);

29
swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
View File

@ -71,6 +71,19 @@ public class InnerTubeConfig extends RocketComponentConfig {
//// ---------------------------- Attributes ---------------------------- //// ---------------------------- Attributes ----------------------------
//// Length
panel.add(new JLabel(trans.get("ThicknessRingCompCfg.tab.Length")));
m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
focusElement = spin;
panel.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
//// Outer diameter //// Outer diameter
panel.add(new JLabel(trans.get("ThicknessRingCompCfg.tab.Outerdiam"))); panel.add(new JLabel(trans.get("ThicknessRingCompCfg.tab.Outerdiam")));
@ -128,22 +141,6 @@ public class InnerTubeConfig extends RocketComponentConfig {
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap"); panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap");
//// Inner tube length
panel.add(new JLabel(trans.get("ThicknessRingCompCfg.tab.Length")));
//// Length
m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
focusElement = spin;
panel.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
mainPanel.add(panel, "aligny 0, gapright 40lp"); mainPanel.add(panel, "aligny 0, gapright 40lp");
//// Right side of panel ---- //// Right side of panel ----

40
swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
View File

@ -29,7 +29,7 @@ public class RingComponentConfig extends RocketComponentConfig {
} }
protected JPanel generalTab(String outer, String inner, String thickness, String length) { protected JPanel generalTab(String length, String outer, String inner, String thickness) {
JPanel primary = new JPanel(new MigLayout()); JPanel primary = new JPanel(new MigLayout());
JPanel panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", "")); JPanel panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
@ -39,6 +39,24 @@ public class RingComponentConfig extends RocketComponentConfig {
//// Attributes ---- //// Attributes ----
//// Length
if (length != null) {
panel.add(new JLabel(length));
m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
if (component instanceof ThicknessRingComponent) {
focusElement = spin;
}
panel.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
}
//// Outer diameter //// Outer diameter
if (outer != null) { if (outer != null) {
panel.add(new JLabel(outer)); panel.add(new JLabel(outer));
@ -110,26 +128,6 @@ public class RingComponentConfig extends RocketComponentConfig {
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap"); panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap");
} }
//// Inner tube length
if (length != null) {
panel.add(new JLabel(length));
//// Length
m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
if (component instanceof ThicknessRingComponent) {
focusElement = spin;
}
panel.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
}
primary.add(panel, "grow, gapright 40lp"); primary.add(panel, "grow, gapright 40lp");

4
swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
View File

@ -23,8 +23,8 @@ public class SleeveConfig extends RingComponentConfig {
//// Inner diameter: //// Inner diameter:
//// Wall thickness: //// Wall thickness:
//// Length: //// Length:
tab = generalTab(trans.get("SleeveCfg.tab.Outerdiam"), trans.get("SleeveCfg.tab.Innerdiam"), tab = generalTab(trans.get("SleeveCfg.tab.Length"), trans.get("SleeveCfg.tab.Outerdiam"),
trans.get("SleeveCfg.tab.Wallthickness"), trans.get("SleeveCfg.tab.Length")); trans.get("SleeveCfg.tab.Innerdiam"), trans.get("SleeveCfg.tab.Wallthickness"));
//// General and General properties //// General and General properties
tabbedPane.insertTab(trans.get("SleeveCfg.tab.General"), null, tab, tabbedPane.insertTab(trans.get("SleeveCfg.tab.General"), null, tab,
trans.get("SleeveCfg.tab.Generalproperties"), 0); trans.get("SleeveCfg.tab.Generalproperties"), 0);

8
swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
View File

@ -19,14 +19,14 @@ public class ThicknessRingComponentConfig extends RingComponentConfig {
super(d, c, parent); super(d, c, parent);
JPanel tab; JPanel tab;
//// Length:
//// Outer diameter: //// Outer diameter:
//// Inner diameter: //// Inner diameter:
//// Wall thickness: //// Wall thickness:
//// Length: tab = generalTab(trans.get("ThicknessRingCompCfg.tab.Length"), trans.get("ThicknessRingCompCfg.tab.Outerdiam"),
tab = generalTab(trans.get("ThicknessRingCompCfg.tab.Outerdiam"),
trans.get("ThicknessRingCompCfg.tab.Innerdiam"), trans.get("ThicknessRingCompCfg.tab.Innerdiam"),
trans.get("ThicknessRingCompCfg.tab.Wallthickness"), trans.get("ThicknessRingCompCfg.tab.Length")); trans.get("ThicknessRingCompCfg.tab.Wallthickness"));
//// General and General properties //// General and General properties
tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, tab, tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, tab,
trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0); trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0);