X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fmain%2FSimulationEditDialog.java;h=35c72db68007316961474486b66c502f57804c0c;hb=77f2457dc781c8c517ddef157c18491ad770f6c6;hp=daba47e716944c9405693f6891c65811d9d11320;hpb=685fa98064d819d518323347255ee5e4410087af;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 daba47e7..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;
@@ -41,7 +42,6 @@ import net.sf.openrocket.gui.components.DescriptionArea;
 import net.sf.openrocket.gui.components.SimulationExportPanel;
 import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.gui.plot.Axis;
-import net.sf.openrocket.gui.customexpression.CustomExpressionPanel;
 import net.sf.openrocket.gui.plot.PlotConfiguration;
 import net.sf.openrocket.gui.plot.SimulationPlotPanel;
 import net.sf.openrocket.gui.util.GUIUtil;
@@ -78,24 +78,25 @@ public class SimulationEditDialog extends JDialog {
 	
 	public static final int DEFAULT = -1;
 	public static final int EDIT = 1;
-	public static final int PLOT = 3;
+	public static final int PLOT = 2;
 	
 
 	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();
@@ -126,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);
 				
 			}
@@ -139,8 +140,6 @@ public class SimulationEditDialog extends JDialog {
 		tabbedPane.addTab(trans.get("simedtdlg.tab.Launchcond"), flightConditionsTab());
 		//// Simulation options
 		tabbedPane.addTab(trans.get("simedtdlg.tab.Simopt"), simulationOptionsTab());
-		//// Custom expressions tab
-		tabbedPane.addTab(trans.get("simedtdlg.tab.CustomExpressions"), customExpressionsTab());
 		//// Plot data
 		tabbedPane.addTab(trans.get("simedtdlg.tab.Plotdata"), plotTab());
 		//// Export data
@@ -150,7 +149,7 @@ public class SimulationEditDialog extends JDialog {
 		if (tab == EDIT) {
 			tabbedPane.setSelectedIndex(0);
 		} else if (tab == PLOT) {
-			tabbedPane.setSelectedIndex(3);
+			tabbedPane.setSelectedIndex(2);
 		} else {
 			FlightData data = s.getSimulatedData();
 			if (data == null || data.getBranchCount() == 0)
@@ -172,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");
@@ -837,11 +836,6 @@ public class SimulationEditDialog extends JDialog {
 		return new SimulationExportPanel(simulation);
 	}
 	
-	
-	private JPanel customExpressionsTab() {
-		return new CustomExpressionPanel(simulation);
-	}
-
 
 	/**
 	 * Return a panel stating that there is no data available, and that the user