projects / sw / motorsim / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce66574)
Removed some system.out
authorBill Kuker <bkuker@billkuker.com>
Thu, 16 Feb 2012 01:50:10 +0000 (01:50 +0000)
committerBill Kuker <bkuker@billkuker.com>
Thu, 16 Feb 2012 01:50:10 +0000 (01:50 +0000)
gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java patch | blob | history
gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java patch | blob | history

diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java
index 6079c2f8d26b52f5952fc550c89878e96273fbc7..8b6d7470840c21b6cbf10e48e6a1e0440802984c 100644 (file)
--- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java
+++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java
@@ -138,7 +138,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener,
                configuration.addChangeListener(new StateChangeListener() {
                        @Override
                        public void stateChanged(EventObject e) {
-                               // System.out.println("Configuration changed, calling updateFigure");
                                updateExtras();
                                figure.updateFigure();
                        }
@@ -153,49 +152,9 @@ public class RocketPanel extends JPanel implements TreeSelectionListener,
 
                setPreferredSize(new Dimension(800, 250));
 
-               // // Create toolbar
-
-               /*
-                * // Side/back buttons FigureTypeAction action = new
-                * FigureTypeAction(RocketFigure.TYPE_SIDE); // // Side view
-                * action.putValue(Action.NAME,
-                * trans.get("RocketPanel.FigTypeAct.Sideview")); // // Side view
-                * action.putValue(Action.SHORT_DESCRIPTION,
-                * trans.get("RocketPanel.FigTypeAct.ttip.Sideview")); JToggleButton
-                * toggle = new JToggleButton(action); add(toggle, "spanx, split");
-                * 
-                * action = new FigureTypeAction(RocketFigure.TYPE_BACK); // // Back
-                * view action.putValue(Action.NAME,
-                * trans.get("RocketPanel.FigTypeAct.Backview")); // // Back view
-                * action.putValue(Action.SHORT_DESCRIPTION,
-                * trans.get("RocketPanel.FigTypeAct.ttip.Backview")); toggle = new
-                * JToggleButton(action); add(toggle, "gap rel");
-                */
-               /*
-                * // Zoom level selector ScaleSelector scaleSelector = new
-                * ScaleSelector(scrollPane); add(scaleSelector);
-                */
-               // add(new JLabel());
-
-               /*
-                * // Stage selector StageSelector stageSelector = new
-                * StageSelector(configuration); add(stageSelector, "");
-                * 
-                * add(new JLabel(), "wrap");
-                */
-               /*
-                * 
-                * // Motor configuration selector //// Motor configuration: JLabel
-                * label = new JLabel(trans.get("RocketPanel.lbl.Motorcfg"));
-                * label.setHorizontalAlignment(JLabel.RIGHT); add(label,
-                * "growx, right"); add(new JComboBox(new
-                * MotorConfigurationModel(configuration)), "wrap");
-                */
+               
                configuration.setMotorConfigurationID(null);
 
-               // add(new JLabel(), "growx, right");
-               // add(new JLabel(), "wrap");
-
                // Create slider and scroll pane
 
                DoubleModel theta = new DoubleModel(figure, "Rotation",
@@ -216,13 +175,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener,
                                JSlider.VERTICAL, true), "ax 50%, wrap, width " + (d.width + 6)
                                + "px:null:null, growy");
 
-               /*
-                * // // <html>Click to select &nbsp;&nbsp; Shift+click to select other
-                * // &nbsp;&nbsp; Double-click to edit &nbsp;&nbsp; Click+drag to move
-                * infoMessage = new JLabel(trans.get("RocketPanel.lbl.infoMessage"));
-                * infoMessage.setFont(new Font("Sans Serif", Font.PLAIN, 9));
-                * add(infoMessage, "skip, span, gapleft 25, wrap");
-                */
                addExtras();
        }
 
@@ -420,7 +372,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener,
                extraText.setTheta(cpTheta);
 
                cg = massCalculator.getCG(configuration, MassCalcType.LAUNCH_MASS);
-               // System.out.println("CG computed as "+cg+ " CP as "+cp);
 
                if (cp.weight > 0.000001)
                        cpx = cp.x;
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 303e7aa33b8f818cfa5fd121d27cf6b49278e468..3df2ceb9a4e2d4de87d55abcca5f5f340ccc9105 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -380,7 +380,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                                                @Override\r
                                                public void actionPerformed(ActionEvent e) {\r
                                                        motor.setFuel((Fuel)getSelectedItem());\r
-                                                       System.out.println("FUEL CHANGED");\r
+                                                       log.debug("FUEL CHANGED");\r
                                                }});\r
                                }\r
                        });\r
rocket motor burn simulator