X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FMassComponentConfig.java;fp=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FMassComponentConfig.java;h=cf70d463fe715244e290000cc31e566a207f1762;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=b199d20965e28a41adec5702a4c19c79365f22d0;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
index b199d209..cf70d463 100644
--- a/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
+++ b/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
@@ -29,11 +29,11 @@ public class MassComponentConfig extends RocketComponentConfig {
 	public MassComponentConfig(OpenRocketDocument d, RocketComponent component) {
 		super(d, component);
 		
-
+		
 		JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
 		
-
-
+		
+		
 		////  Mass
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Mass")));
 		
@@ -46,8 +46,20 @@ public class MassComponentConfig extends RocketComponentConfig {
 		panel.add(new UnitSelector(m), "growx");
 		panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.5)), "w 100lp, wrap");
 		
-
-
+		
+		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Density")));
+		
+		m = new DoubleModel(component, "Density", UnitGroup.UNITS_DENSITY_BULK, 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(500, 2000, 10000)), "w 100lp, wrap");
+		
+		
+		
 		////  Mass length
 		//// Length
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Length")));
@@ -61,7 +73,7 @@ public class MassComponentConfig extends RocketComponentConfig {
 		panel.add(new UnitSelector(m), "growx");
 		panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
 		
-
+		
 		//// Tube diameter
 		//// Diameter:
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Diameter")));
@@ -76,7 +88,7 @@ public class MassComponentConfig extends RocketComponentConfig {
 		panel.add(new UnitSelector(od), "growx");
 		panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap");
 		
-
+		
 		////  Position
 		//// Position relative to:
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.PosRelativeto")));
@@ -88,7 +100,7 @@ public class MassComponentConfig extends RocketComponentConfig {
 								RocketComponent.Position.MIDDLE,
 								RocketComponent.Position.BOTTOM,
 								RocketComponent.Position.ABSOLUTE
-				}));
+						}));
 		panel.add(combo, "spanx, growx, wrap");
 		//// plus
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.plus")), "right");
@@ -130,11 +142,11 @@ public class MassComponentConfig extends RocketComponentConfig {
 		panel.add(new UnitSelector(m), "growx");
 		panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
 		
-
+		
 		//// Radial direction:
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Radialdirection")));
 		
-		m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE, 0);
+		m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
 		
 		spin = new JSpinner(m.getSpinnerModel());
 		spin.setEditor(new SpinnerEditor(spin));
@@ -143,7 +155,7 @@ public class MassComponentConfig extends RocketComponentConfig {
 		panel.add(new UnitSelector(m), "growx");
 		panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
 		
-
+		
 		//// Reset button
 		JButton button = new JButton(trans.get("MassComponentCfg.but.Reset"));
 		button.addActionListener(new ActionListener() {