X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=blobdiff_plain;f=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2Fmotor%2FBurnPlotFragment.java;fp=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2Fmotor%2FBurnPlotFragment.java;h=eff07756a696c5a4d7e2b202b879d95cb8de07ae;hp=53ff92054d3a4689f9236b6a7a77f83b76db6714;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02

diff --git a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
index 53ff9205..eff07756 100644
--- a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
@@ -98,7 +98,7 @@ public class BurnPlotFragment extends Fragment {
 		renderer.setAxesColor(Color.LTGRAY);
 		renderer.setLabelsColor(Color.LTGRAY);
 
-		renderer.setChartTitle(motor.getThrustCurveMotor().getManufacturer() + " " + motor.getThrustCurveMotor().getDesignation());
+		renderer.setChartTitle(motor.getManufacturer() + " " + motor.getDesignation());
 
 		renderer.setXTitle("time (s)");
 		renderer.setXLabelsAlign(Align.RIGHT);
@@ -122,17 +122,17 @@ public class BurnPlotFragment extends Fragment {
 
 		XYMultipleSeriesDataset dataset = new XYMultipleSeriesDataset();
 
-		XYSeries series = new XYSeries(motor.getThrustCurveMotor().getDesignation(), 0);
+		XYSeries series = new XYSeries(motor.getDesignation(), 0);
 		
-		double[] timePoints = motor.getThrustCurveMotor().getTimePoints();
-		double[] thrustPoints = motor.getThrustCurveMotor().getThrustPoints();
+		double[] timePoints = motor.getTimePoints();
+		double[] thrustPoints = motor.getThrustPoints();
 
 		// We are going to abuse this loop to also compute the Y axis max.
 		int maxy = 0;
 		int datasize = timePoints.length;
 		for( int i = 0; i<datasize; i++ ) {
 			series.add(timePoints[i], thrustPoints[i]);
-			int ceil = new Double(Math.ceil(thrustPoints[i])).intValue();
+			int ceil =(int) Math.ceil(thrustPoints[i]);
 			if ( ceil > maxy ) {
 				maxy = ceil;
 			}
@@ -144,7 +144,7 @@ public class BurnPlotFragment extends Fragment {
 		if ( maxx >= 2.0 ) {
 			maxx = Math.ceil(maxx);
 		} else {
-			maxx = new Double( Math.ceil(maxx*10.0) ).intValue() /10.0;
+			maxx = Math.ceil(maxx*10.0) /10.0;
 		}
 		renderer.setXAxisMax(maxx);