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;
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;
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();
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);
}
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
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)
@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");
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