X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fdialogs%2FComponentAnalysisDialog.java;fp=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fdialogs%2FComponentAnalysisDialog.java;h=9f5064ed8a0f12153b26439b1d773effcc9c435e;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=635e6468ecfe5a8b5901ca186a1595ffa0f385a6;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index 635e6468..9f5064ed 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -119,7 +119,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 		roll = new DoubleModel(rocketPanel, "CPRoll", UnitGroup.UNITS_ROLL);
 		
 		//// Wind direction:
-		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")), "width 100lp!");
+		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")), "width 120lp!");
 		panel.add(new UnitSelector(theta, true), "width 50lp!");
 		BasicSlider slider = new BasicSlider(theta.getSliderModel(0, 2 * Math.PI));
 		panel.add(slider, "growx, split 2");
@@ -149,17 +149,17 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 		panel.add(scrollPane, "gap paragraph, spany 4, width 300lp!, growy 1, height :100lp:, wrap");
 		
 		////Angle of attack:
-		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")), "width 100lp!");
+		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")), "width 120lp!");
 		panel.add(new UnitSelector(aoa, true), "width 50lp!");
 		panel.add(new BasicSlider(aoa.getSliderModel(0, Math.PI)), "growx, wrap");
 		
 		//// Mach number:
-		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")), "width 100lp!");
+		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")), "width 120lp!");
 		panel.add(new UnitSelector(mach, true), "width 50lp!");
 		panel.add(new BasicSlider(mach.getSliderModel(0, 3)), "growx, wrap");
 		
 		//// Roll rate:
-		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")), "width 100lp!");
+		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")), "width 120lp!");
 		panel.add(new UnitSelector(roll, true), "width 50lp!");
 		panel.add(new BasicSlider(roll.getSliderModel(-20 * 2 * Math.PI, 20 * 2 * Math.PI)),
 				"growx, wrap paragraph");
@@ -193,7 +193,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 			public Object getValueAt(int row) {
 				RocketComponent c = cpData.get(row).getComponent();
 				if (c instanceof Rocket) {
-					return "Total";
+					return trans.get("componentanalysisdlg.TOTAL");
 				}
 				return c.toString();
 			}
@@ -203,7 +203,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 				return 200;
 			}
 		},
-				new Column("CG / " + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit()) {
+				new Column(trans.get("componentanalysisdlg.TabStability.Col.CG") + " / " + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit()) {
 					private Unit unit = UnitGroup.UNITS_LENGTH.getDefaultUnit();
 					
 					@Override
@@ -211,7 +211,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 						return unit.toString(cgData.get(row).x);
 					}
 				},
-				new Column("Mass / " + UnitGroup.UNITS_MASS.getDefaultUnit().getUnit()) {
+				new Column(trans.get("componentanalysisdlg.TabStability.Col.Mass") + " / " + UnitGroup.UNITS_MASS.getDefaultUnit().getUnit()) {
 					private Unit unit = UnitGroup.UNITS_MASS.getDefaultUnit();
 					
 					@Override
@@ -219,7 +219,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 						return unit.toString(cgData.get(row).weight);
 					}
 				},
-				new Column("CP / " + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit()) {
+				new Column(trans.get("componentanalysisdlg.TabStability.Col.CP") + " / " + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit()) {
 					private Unit unit = UnitGroup.UNITS_LENGTH.getDefaultUnit();
 					
 					@Override
@@ -268,7 +268,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 					public Object getValueAt(int row) {
 						RocketComponent c = dragData.get(row).getComponent();
 						if (c instanceof Rocket) {
-							return "Total";
+							return trans.get("componentanalysisdlg.TOTAL");
 						}
 						return c.toString();
 					}
@@ -342,7 +342,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 					public Object getValueAt(int row) {
 						RocketComponent c = rollData.get(row).getComponent();
 						if (c instanceof Rocket) {
-							return "Total";
+							return trans.get("componentanalysisdlg.TOTAL");
 						}
 						return c.toString();
 					}
@@ -407,13 +407,13 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 		this.addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosed(WindowEvent e) {
-				System.out.println("Closing method called: " + this);
+				//System.out.println("Closing method called: " + this);
 				theta.removeChangeListener(ComponentAnalysisDialog.this);
 				aoa.removeChangeListener(ComponentAnalysisDialog.this);
 				mach.removeChangeListener(ComponentAnalysisDialog.this);
 				roll.removeChangeListener(ComponentAnalysisDialog.this);
 				configuration.removeChangeListener(ComponentAnalysisDialog.this);
-				System.out.println("SETTING NAN VALUES");
+				//System.out.println("SETTING NAN VALUES");
 				rocketPanel.setCPAOA(Double.NaN);
 				rocketPanel.setCPTheta(Double.NaN);
 				rocketPanel.setCPMach(Double.NaN);
@@ -541,7 +541,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
 		// Set warnings
 		if (set.isEmpty()) {
 			warningList.setListData(new String[] {
-					"<html><i><font color=\"gray\">No warnings.</font></i>"
+					trans.get("componentanalysisdlg.noWarnings")
 			});
 		} else {
 			warningList.setListData(new Vector<Warning>(set));