From 02f3f48f3a86035a2f7d28f16a93635ca72b3c87 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@github.com>
Date: Mon, 27 May 2013 16:54:09 -0500
Subject: [PATCH] Added buttons to the edit and plot dialogs to switch to the
 other one.

---
 .../sf/openrocket/document/Simulation.java    | 16 ++++++++++-
 .../openrocket/gui/main/SimulationPanel.java  |  2 +-
 .../gui/simulation/SimulationEditDialog.java  | 27 +++++++++++++++----
 .../SimulationPlotExportDialog.java           | 18 +++++++++++--
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java
index ad3379b8a..39a97d930 100644
--- a/core/src/net/sf/openrocket/document/Simulation.java
+++ b/core/src/net/sf/openrocket/document/Simulation.java
@@ -374,7 +374,21 @@ public class Simulation implements ChangeSource, Cloneable {
 		return simulatedData;
 	}
 	
-	
+	/**
+	 * Return true if this simulation contains plotable flight data.
+	 * 
+	 * @return
+	 */
+	public boolean hasSimulationData() {
+		FlightData data = getSimulatedData();
+		if (data == null) {
+			return false;
+		}
+		if (data.getBranchCount() == 0) {
+			return false;
+		}
+		return true;
+	}
 	
 	/**
 	 * Returns a copy of this simulation suitable for cut/copy/paste operations.
diff --git a/core/src/net/sf/openrocket/gui/main/SimulationPanel.java b/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
index aa27ebc3a..558ca9ef6 100644
--- a/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -228,7 +228,7 @@ public class SimulationPanel extends JPanel {
 				
 				Simulation sim = document.getSimulations().get(selected);
 				
-				if (sim.getSimulatedData() == null || sim.getSimulatedData().getBranchCount() == 0) {
+				if (!sim.hasSimulationData()) {
 					new SimulationRunDialog(SwingUtilities.getWindowAncestor(
 							SimulationPanel.this), document, sim).setVisible(true);
 				}
diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
index ab05b176a..47634e048 100644
--- a/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
+++ b/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
@@ -149,11 +149,28 @@ public class SimulationEditDialog extends JDialog {
 		mainPanel.add(tabbedPane, "spanx, grow, wrap");
 		
 		
-		// Buttons
-		mainPanel.add(new JPanel(), "spanx, split, growx");
+		//// Open Plot button
+		JButton button = new JButton("<<Plot");
+		button.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				SimulationEditDialog.this.dispose();
+				SimulationPlotExportDialog plot = new SimulationPlotExportDialog(SimulationEditDialog.this.parentWindow,
+						SimulationEditDialog.this.document, SimulationEditDialog.this.simulation[0]);
+				plot.setVisible(true);
+			}
+			
+		});
+		mainPanel.add(button, "spanx, split 3, align left");
+		if (sims.length == 1 && sims[0].hasSimulationData()) {
+			button.setVisible(true);
+		} else {
+			button.setVisible(false);
+		}
 		
 		//// Run simulation button
-		JButton button = new JButton(trans.get("simedtdlg.but.runsimulation"));
+		button = new JButton(trans.get("simedtdlg.but.runsimulation"));
 		button.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -162,7 +179,7 @@ public class SimulationEditDialog extends JDialog {
 				SimulationRunDialog.runSimulations(parentWindow, SimulationEditDialog.this.document, simulation);
 			}
 		});
-		mainPanel.add(button, "gapright para");
+		mainPanel.add(button, " align right, tag ok");
 		
 		//// Close button 
 		JButton close = new JButton(trans.get("dlg.but.close"));
@@ -173,7 +190,7 @@ public class SimulationEditDialog extends JDialog {
 				SimulationEditDialog.this.dispose();
 			}
 		});
-		mainPanel.add(close, "");
+		mainPanel.add(close, "tag ok");
 		
 		
 		this.add(mainPanel);
diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationPlotExportDialog.java b/core/src/net/sf/openrocket/gui/simulation/SimulationPlotExportDialog.java
index a8b3c499b..d82ac605b 100644
--- a/core/src/net/sf/openrocket/gui/simulation/SimulationPlotExportDialog.java
+++ b/core/src/net/sf/openrocket/gui/simulation/SimulationPlotExportDialog.java
@@ -24,7 +24,7 @@ public class SimulationPlotExportDialog extends JDialog {
 	private final Simulation simulation;
 	private static final Translator trans = Application.getTranslator();
 	
-	public SimulationPlotExportDialog(Window parent, OpenRocketDocument document, Simulation s) {
+	public SimulationPlotExportDialog(Window parent, final OpenRocketDocument document, Simulation s) {
 		//// Plot/Export simulation
 		super(parent, trans.get("simedtdlg.title.Editsim"), JDialog.ModalityType.DOCUMENT_MODAL);
 		this.parentWindow = parent;
@@ -49,6 +49,21 @@ public class SimulationPlotExportDialog extends JDialog {
 		
 		mainPanel.add(tabbedPane, "grow, wrap");
 		
+		JButton button = new JButton("<<Edit");
+		button.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				SimulationPlotExportDialog.this.dispose();
+				SimulationEditDialog edit = new SimulationEditDialog(SimulationPlotExportDialog.this.parentWindow,
+						document, SimulationPlotExportDialog.this.simulation);
+				edit.setVisible(true);
+			}
+			
+		});
+		
+		mainPanel.add(button, "spanx, split 3, align left");
+		
 		JButton ok = new JButton(trans.get("dlg.but.ok"));
 		ok.addActionListener(new ActionListener() {
 			@Override
@@ -87,5 +102,4 @@ public class SimulationPlotExportDialog extends JDialog {
 		GUIUtil.setDisposableDialogOptions(this, close);
 		
 	}
-	
 }