Comment out a bunch of System.out.printlns.

[debian/openrocket] / core / src / net / sf / openrocket / gui / main / SimulationEditDialog.java

diff --git a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
index 2b5ca7e7c4497810de2c0100402af8cce17da763..0f9f6656cd1a8dda31e14675b4f6b7c751625205 100644 (file)
--- a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
+++ b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java
@@ -41,6 +41,7 @@ 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;
@@ -77,7 +78,7 @@ public class SimulationEditDialog extends JDialog {
        
        public static final int DEFAULT = -1;
        public static final int EDIT = 1;
-       public static final int PLOT = 2;
+       public static final int PLOT = 3;
        
 
        private final Window parentWindow;
@@ -125,7 +126,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);
                                
                        }
@@ -138,6 +139,8 @@ 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
@@ -147,7 +150,7 @@ public class SimulationEditDialog extends JDialog {
                if (tab == EDIT) {
                        tabbedPane.setSelectedIndex(0);
                } else if (tab == PLOT) {
-                       tabbedPane.setSelectedIndex(2);
+                       tabbedPane.setSelectedIndex(3);
                } else {
                        FlightData data = s.getSimulatedData();
                        if (data == null || data.getBranchCount() == 0)
@@ -241,7 +244,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 +269,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);
                
@@ -835,7 +838,9 @@ public class SimulationEditDialog extends JDialog {
        }
        
        
-
+       private JPanel customExpressionsTab() {
+               return new CustomExpressionPanel(simulation);
+       }
 
 
        /**