projects / sw / motorsim / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 73fa8ca)
Use shared colors
authorBill Kuker <bkuker@billkuker.com>
Mon, 23 Jan 2012 19:46:38 +0000 (19:46 +0000)
committerBill Kuker <bkuker@billkuker.com>
Mon, 23 Jan 2012 19:46:38 +0000 (19:46 +0000)
gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java patch | blob | history
gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java patch | blob | history

diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
index 0eb73d5c7927afd728c03fd7ffbd1ea08026ee08..b267a46bf8a05ce3ae3eee755db2c493d29eaf19 100644 (file)
--- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
+++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
@@ -37,6 +37,7 @@ import net.sf.openrocket.unit.UnitGroup;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Burn;\r
+import com.billkuker.rocketry.motorsim.Colors;\r
 import com.billkuker.rocketry.motorsim.Motor;\r
 import com.billkuker.rocketry.motorsim.RocketScience;\r
 import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference;\r
@@ -46,8 +47,6 @@ public class RocketSimTable extends JPanel implements BurnWatcher,
                RocketScience.UnitPreferenceListener {\r
        static final long serialVersionUID = 1L;\r
 \r
-       private static final Color RED = new Color(196, 0, 0);\r
-\r
        static {\r
                Application.setBaseTranslator(new ResourceBundleTranslator(\r
                                "l10n.messages"));\r
@@ -162,7 +161,7 @@ public class RocketSimTable extends JPanel implements BurnWatcher,
                                                isSelected, hasFocus, row, column);\r
                                Entry e = entries.get(row);\r
                                if (e.ready && e.s.getSimulatedWarnings().size() > 0) {\r
-                                       c.setBackground(RED);\r
+                                       c.setBackground(Colors.RED);\r
                                        c.setForeground(Color.WHITE);\r
                                        StringBuilder sb = new StringBuilder();\r
                                        sb.append("<html>");\r
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java
index b78d2172eb91c43b0ffa72c7fd40bafd05cc41f4..24a9c9d1044bc36b06302da56954c5fc207a39e8 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java
@@ -16,13 +16,12 @@ import org.jscience.physics.amount.Amount;
 \r
 import com.billkuker.rocketry.motorsim.Burn;\r
 import com.billkuker.rocketry.motorsim.BurnSummary;\r
+import com.billkuker.rocketry.motorsim.Colors;\r
 import com.billkuker.rocketry.motorsim.RocketScience;\r
 \r
 public class SummaryPanel extends JPanel implements Burn.BurnProgressListener, RocketScience.UnitPreferenceListener {\r
        private static final long serialVersionUID = 1L;\r
-       private static final Color RED = new Color(196, 0, 0);\r
-       private static final Color GREEN = new Color(0, 196, 0);\r
-       private static final Color ORANGE = new Color(160, 96, 0);\r
+\r
        private final Burn burn;\r
        private final JProgressBar bar = new JProgressBar();\r
        private BurnSummary bs;\r
@@ -100,11 +99,11 @@ public class SummaryPanel extends JPanel implements Burn.BurnProgressListener, R
                                } else {\r
                                        double d = bi.getSaftyFactor();\r
                                        if (d >= 1.5) {\r
-                                               saftyColor = GREEN;\r
+                                               saftyColor = Colors.GREEN;\r
                                        } else if (d > 1) {\r
-                                               saftyColor = ORANGE;\r
+                                               saftyColor = Colors.ORANGE;\r
                                        } else {\r
-                                               saftyColor = RED;\r
+                                               saftyColor = Colors.RED;\r
                                        }\r
                                        JLabel l = new JLabel(new DecimalFormat("##########.##")\r
                                                        .format(bi.getSaftyFactor()));\r
rocket motor burn simulator