Show percent of motor class
authorBill Kuker <bkuker@billkuker.com>
Tue, 1 Sep 2009 00:32:22 +0000 (00:32 +0000)
committerBill Kuker <bkuker@billkuker.com>
Tue, 1 Sep 2009 00:32:22 +0000 (00:32 +0000)
src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java

index 9f95aeb3ca258e0a3f993aed04231d118e0f6e9e..7cf8ac1dbe56eebb2345d2d25af5c18f44843542 100644 (file)
@@ -118,7 +118,10 @@ public class BurnPanel extends JPanel {
                                if ( thrustTime.isGreaterThan(Amount.valueOf(0, SI.SECOND)))\r
                                        averageThrust = ns.divide(thrustTime).to(SI.NEWTON);\r
 \r
-                               int cn = (int)(Math.log(ns.doubleValue(RocketScience.NEWTON_SECOND)/1.25) / Math.log(2));\r
+                               float cnf = (float)(Math.log(ns.doubleValue(RocketScience.NEWTON_SECOND)/1.25) / Math.log(2));\r
+                               int cn = (int)cnf;\r
+                               float fraction = cnf - cn;\r
+                               int percent = (int)(100 * fraction);\r
                                char cl = (char)((int)'A' + cn);\r
 \r
                        \r
@@ -130,7 +133,7 @@ public class BurnPanel extends JPanel {
                        text.add(new JLabel("Average Thust"));\r
                        text.add(new JLabel("Max Pressure"));\r
                        \r
-                       text.add(new JLabel(new String(new char[]{cl}) + "-" +Math.round(averageThrust.doubleValue(SI.NEWTON))));\r
+                       text.add(new JLabel(percent + "% " + new String(new char[]{cl}) + "-" +Math.round(averageThrust.doubleValue(SI.NEWTON))));\r
                        text.add(new JLabel(approx(ns)));\r
                        text.add(new JLabel(approx(maxThrust)));\r
                        text.add(new JLabel(approx(averageThrust)));\r