updates for 0.9.4

[debian/openrocket] / src / net / sf / openrocket / gui / main / SimulationEditDialog.java
diff --git a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java

index d4774471a3aa784166dfa1b910c21312d13061cc..81234d3eaf5d03482b0de717ff5562c352aa1166 100644 (file)
--- a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
+++ b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
@@ -38,6 +38,7 @@ import net.sf.openrocket.gui.adaptors.DoubleModel;
  import net.sf.openrocket.gui.adaptors.MotorConfigurationModel;
  import net.sf.openrocket.gui.components.BasicSlider;
  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.plot.PlotConfiguration;
@@ -126,7 +127,7 @@ public class SimulationEditDialog extends JDialog {
                 tabbedPane.addTab("Launch conditions", flightConditionsTab());
                 tabbedPane.addTab("Simulation options", simulationOptionsTab());
                 tabbedPane.addTab("Plot data", plotTab());
-//             tabbedPane.addTab("Export data", exportTab());
+               tabbedPane.addTab("Export data", exportTab());
                 
                 // Select the initial tab
                 if (tab == EDIT) {
@@ -173,8 +174,8 @@ public class SimulationEditDialog extends JDialog {
                 this.validate();
                 this.pack();
                 this.setLocationByPlatform(true);
-               GUIUtil.setDefaultButton(button);
-               GUIUtil.installEscapeCloseOperation(this);
+               
+               GUIUtil.setDisposableDialogOptions(this, button);
         }
         
         
@@ -650,11 +651,11 @@ public class SimulationEditDialog extends JDialog {
                 
                 
                 DescriptionArea desc = new DescriptionArea(5);
-               desc.setText("<html><p>" +
+               desc.setText("<html>" +
                                 "<i>Simulation listeners</i> is an advanced feature that allows "+
                                 "user-written code to listen to and interact with the simulation.  " +
                                 "For details on writing simulation listeners, see the OpenRocket " +
-                               "technical documentation.</p>");
+                               "technical documentation.");
                 sub.add(desc, "aligny 0, growx, wrap para");
                 
                 
@@ -778,19 +779,15 @@ public class SimulationEditDialog extends JDialog {
          * A panel for exporting the data.
          */
         private JPanel exportTab() {
+               FlightData data = simulation.getSimulatedData();
  
                 // Check that data exists
-               if (simulation.getSimulatedData() == null  ||
-                               simulation.getSimulatedData().getBranchCount() == 0) {
+               if (data == null  || data.getBranchCount() == 0 ||
+                               data.getBranch(0).getTypes().length == 0) {
                         return noDataPanel();
                 }
                 
-               
-               JPanel panel = new JPanel(new MigLayout("fill"));
-               
-               panel.add(new JLabel("Not implemented yet.")); // TODO: HIGH: Implement export
-               
-               return panel;
+               return new SimulationExportPanel(simulation);
         }
         
         
@@ -801,7 +798,7 @@ public class SimulationEditDialog extends JDialog {
          * Return a panel stating that there is no data available, and that the user
          * should run the simulation first.
          */
-       private JPanel noDataPanel() {
+       public static JPanel noDataPanel() {
                 JPanel panel = new JPanel(new MigLayout("fill"));
                 
                 // No data available
@@ -934,8 +931,8 @@ public class SimulationEditDialog extends JDialog {
  
                 dialog.setLocationByPlatform(true);
                 dialog.pack();
-               GUIUtil.installEscapeCloseOperation(dialog);
-               GUIUtil.setDefaultButton(button);
+               
+               GUIUtil.setDisposableDialogOptions(dialog, button);
  
                 dialog.setVisible(true);
         }