X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gui%2Fcom%2Fbillkuker%2Frocketry%2Fmotorsim%2Fvisual%2FBurnPanel.java;h=6ee32df1f6626df0e1f632be0e65a8fa795c8b53;hb=e5edf8892255e0e518299b96ac2f0556761952ea;hp=632d273b00385686c7e5c5aebe5b1700f365893d;hpb=28777c334e8fd331ecfdd211879ed94170e30bab;p=sw%2Fmotorsim

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 632d273..6ee32df 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -3,8 +3,6 @@ package com.billkuker.rocketry.motorsim.visual;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.text.DecimalFormat;
 import java.text.NumberFormat;
 
 import javax.measure.quantity.Duration;
@@ -13,7 +11,6 @@ import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Velocity;
 import javax.measure.unit.SI;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JSplitPane;
@@ -25,7 +22,6 @@ import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Burn;
 import com.billkuker.rocketry.motorsim.BurnSummary;
-import com.billkuker.rocketry.motorsim.RocketScience;
 
 public class BurnPanel extends JPanel {
 	private static final long serialVersionUID = 1L;
@@ -100,64 +96,39 @@ public class BurnPanel extends JPanel {
 			
 			add( new SL(), BorderLayout.SOUTH);
 			
-			
+			BurnSummary bi = new BurnSummary(burn);
+			SummaryPanel text = new SummaryPanel(burn);
+			text.setBurnSummary(bi);
+			add(text, BorderLayout.NORTH);
 			
 			{
-				BurnSummary bi = new BurnSummary(burn);
-				JPanel text = new JPanel(new GridLayout(2, 5));
-
-				text.add(new JLabel("Rating"));
-				text.add(new JLabel("Total Impulse"));
-				text.add(new JLabel("ISP"));
-				text.add(new JLabel("Max Thrust"));
-				text.add(new JLabel("Average Thust"));
-				text.add(new JLabel("Max Pressure"));
-				
-				text.add(new JLabel("Safty Factor"));
 
-				text.add(new JLabel(bi.getRating()));
-				text.add(new JLabel(RocketScience.ammountToRoundedString(bi.totalImpulse())));
-				text.add(new JLabel(RocketScience.ammountToRoundedString(bi.specificImpulse())));
-				text.add(new JLabel(RocketScience
-						.ammountToRoundedString(bi.maxThrust())));
-				text.add(new JLabel(RocketScience
-						.ammountToRoundedString(bi.averageThrust())));
-				text.add(new JLabel(RocketScience
-						.ammountToRoundedString(bi.maxPressure())));
-				
+				//Color in the Burst marker
 				Color saftyColor;
 				if ( bi.getSaftyFactor() == null ){
-
 					saftyColor = Color.BLACK;
-					text.add(new JLabel("NA"));
 				} else {
 					double d = bi.getSaftyFactor();
-					if ( d > 1.5 ){
+					if ( d >= 1.5 ){
 						saftyColor = GREEN;
 					} else if ( d > 1 ){
 						saftyColor = ORANGE;
 					} else {
 						saftyColor = RED;
 					}
-					JLabel l = new JLabel( new DecimalFormat("##########.#").format(bi.getSaftyFactor()));
-					l.setOpaque(true);
-					l.setBackground(saftyColor);
-					l.setForeground(Color.WHITE);
-					text.add(l);
+				}
+				Amount<Pressure> burst = b.getMotor().getChamber().getBurstPressure();
+				if ( burst != null ){
+					pressure.addRangeMarker(burst, "Burst", saftyColor);
 				}
 				
-
-				add(text, BorderLayout.NORTH);
-				
+				//Add some additional Markers
 				thrust.addRangeMarker(bi.maxThrust(), "Max", Color.BLACK);
 				thrust.addRangeMarker(bi.averageThrust(), "Average", Color.BLACK);
 				pressure.addRangeMarker(bi.maxPressure(), "Max", Color.BLACK);
 				burnRate.addDomainMarker(bi.maxPressure(), "Max", RED);
 				
-				Amount<Pressure> burst = b.getMotor().getChamber().burstPressure();
-				if ( burst != null ){
-					pressure.addRangeMarker(burst, "Burst", saftyColor);
-				}
+
 			}