X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fmain%2FSimulationEditDialog.java;h=35c72db68007316961474486b66c502f57804c0c;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=2b5ca7e7c4497810de2c0100402af8cce17da763;hpb=ace80eeeeca723d4bd6f1cf6736f16b70055be8f;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
index 2b5ca7e7..35c72db6 100644
--- a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
+++ b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
@@ -30,6 +30,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.gui.SpinnerEditor;
 import net.sf.openrocket.gui.adaptors.BooleanModel;
@@ -82,19 +83,20 @@ public class SimulationEditDialog extends JDialog {
 
 	private final Window parentWindow;
 	private final Simulation simulation;
+	private final OpenRocketDocument document;
 	private final SimulationOptions conditions;
 	private final Configuration configuration;
 	private static final Translator trans = Application.getTranslator();
 	
 	
-	public SimulationEditDialog(Window parent, Simulation s) {
-		this(parent, s, 0);
+	public SimulationEditDialog(Window parent, OpenRocketDocument document, Simulation s) {
+		this(parent, document, s, 0);
 	}
 	
-	public SimulationEditDialog(Window parent, Simulation s, int tab) {
+	public SimulationEditDialog(Window parent, OpenRocketDocument document, Simulation s, int tab) {
 		//// Edit simulation
 		super(parent, trans.get("simedtdlg.title.Editsim"), JDialog.ModalityType.DOCUMENT_MODAL);
-		
+		this.document = document;
 		this.parentWindow = parent;
 		this.simulation = s;
 		this.conditions = simulation.getOptions();
@@ -125,7 +127,7 @@ public class SimulationEditDialog extends JDialog {
 				String name = field.getText();
 				if (name == null || name.equals(""))
 					return;
-				System.out.println("Setting name:" + name);
+				//System.out.println("Setting name:" + name);
 				simulation.setName(name);
 				
 			}
@@ -169,7 +171,7 @@ public class SimulationEditDialog extends JDialog {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				SimulationEditDialog.this.dispose();
-				SimulationRunDialog.runSimulations(parentWindow, simulation);
+				SimulationRunDialog.runSimulations(parentWindow, SimulationEditDialog.this.document, simulation);
 			}
 		});
 		mainPanel.add(button, "gapright para");
@@ -241,7 +243,7 @@ public class SimulationEditDialog extends JDialog {
 		label.setToolTipText(tip);
 		sub.add(label);
 		
-		m = new DoubleModel(conditions, "WindSpeedAverage", UnitGroup.UNITS_VELOCITY, 0);
+		m = new DoubleModel(conditions, "WindSpeedAverage", UnitGroup.UNITS_WINDSPEED, 0);
 		
 		spin = new JSpinner(m.getSpinnerModel());
 		spin.setEditor(new SpinnerEditor(spin));
@@ -266,7 +268,7 @@ public class SimulationEditDialog extends JDialog {
 		label.setToolTipText(tip);
 		sub.add(label);
 		
-		m = new DoubleModel(conditions, "WindSpeedDeviation", UnitGroup.UNITS_VELOCITY, 0);
+		m = new DoubleModel(conditions, "WindSpeedDeviation", UnitGroup.UNITS_WINDSPEED, 0);
 		DoubleModel m2 = new DoubleModel(conditions, "WindSpeedAverage", 0.25,
 				UnitGroup.UNITS_COEFFICIENT, 0);
 		
@@ -834,9 +836,6 @@ public class SimulationEditDialog extends JDialog {
 		return new SimulationExportPanel(simulation);
 	}
 	
-	
-
-
 
 	/**
 	 * Return a panel stating that there is no data available, and that the user