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

Promote placement to top-right 🍾

Browse Source
This commit is contained in:
SiboVG 2023-01-16 03:43:28 +01:00
parent f25e3c8297
commit e6f3c7b040
8 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
View File

@ -125,14 +125,6 @@ public class EllipticalFinSetConfig extends FinSetConfig {
// Right side panel // Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
//// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
{// ------ Placement ------ {// ------ Placement ------
//// Position relative to: //// Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -155,6 +147,15 @@ public class EllipticalFinSetConfig extends FinSetConfig {
} }
} }
{//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
}
{//// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
}
mainPanel.add(panel, "aligny 0"); mainPanel.add(panel, "aligny 0");
addFinSetButtons(); addFinSetButtons();

18
swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
View File

@ -174,15 +174,6 @@ public class FreeformFinSetConfig extends FinSetConfig {
// Right side panel // Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
{ //// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
}
{ //// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
}
{//// -------- Placement ------ {//// -------- Placement ------
//// Position relative to: //// Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -205,6 +196,15 @@ public class FreeformFinSetConfig extends FinSetConfig {
} }
} }
{ //// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
}
{ //// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
}
mainPanel.add(panel, "aligny 0"); mainPanel.add(panel, "aligny 0");
return mainPanel; return mainPanel;

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

@ -151,13 +151,13 @@ public class InnerTubeConfig extends RocketComponentConfig {
//// Right side of panel ---- //// Right side of panel ----
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]"));
//// ---------------------------- Placement ----------------------------
panel.add(new PlacementPanel(component, order), "span, grow");
//// Material //// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order); MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap"); panel.add(materialPanel, "span, grow, wrap");
//// ---------------------------- Placement ----------------------------
panel.add(new PlacementPanel(component, order), "span, grow");
mainPanel.add(panel, "aligny 0"); mainPanel.add(panel, "aligny 0");
tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, mainPanel, tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, mainPanel,

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

@ -101,10 +101,6 @@ public class LaunchLugConfig extends RocketComponentConfig {
// Right panel // Right panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
{//// Placement {//// Placement
//// Position relative to: //// Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -124,6 +120,10 @@ public class LaunchLugConfig extends RocketComponentConfig {
placementPanel.add(new BasicSlider(m.getSliderModel()), "w 100lp, wrap"); placementPanel.add(new BasicSlider(m.getSliderModel()), "w 100lp, wrap");
} }
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
primary.add(panel, "grow"); primary.add(panel, "grow");
//// General and General properties //// General and General properties

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

@ -143,10 +143,6 @@ public class RailButtonConfig extends RocketComponentConfig {
// Right side panel // Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel,"span, grow, wrap");
{// -------- Placement ------ {// -------- Placement ------
//// Position relative to: //// Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -164,6 +160,10 @@ public class RailButtonConfig extends RocketComponentConfig {
} }
} }
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel,"span, grow, wrap");
primary.add(panel, "grow"); primary.add(panel, "grow");
return primary; return primary;

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

@ -139,13 +139,13 @@ public class RingComponentConfig extends RocketComponentConfig {
JPanel rightSide = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", "")); JPanel rightSide = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
primary.add(rightSide, "cell 4 0, aligny 0, spany"); primary.add(rightSide, "cell 4 0, aligny 0, spany");
//// Position
rightSide.add(new PlacementPanel(component, order), "span, grow");
//// Material //// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order); MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
rightSide.add(materialPanel, "span, grow, wrap"); rightSide.add(materialPanel, "span, grow, wrap");
//// Position
rightSide.add(new PlacementPanel(component, order), "span, grow");
return primary; return primary;
} }

16
swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
View File

@ -176,13 +176,6 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
// Right side panel // Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
{//// -------- Placement ------- {//// -------- Placement -------
// Position relative to: // Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -206,6 +199,15 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
} }
} }
{//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
}
{// Root fillets
panel.add(filletMaterialPanel(), "span, grow, wrap");
}
mainPanel.add(panel, "aligny 0"); mainPanel.add(panel, "aligny 0");
//// General and General properties //// General and General properties

9
swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
View File

@ -110,10 +110,6 @@ public class TubeFinSetConfig extends RocketComponentConfig {
// Right side panel // Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", "")); panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
{ //// Placement { //// Placement
//// Position relative to: //// Position relative to:
JPanel placementPanel = new PlacementPanel(component, order); JPanel placementPanel = new PlacementPanel(component, order);
@ -136,6 +132,11 @@ public class TubeFinSetConfig extends RocketComponentConfig {
placementPanel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap"); placementPanel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
} }
{//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
panel.add(materialPanel, "span, grow, wrap");
}
primary.add(panel, "grow"); primary.add(panel, "grow");