Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / motor / BurnPlotFragment.java

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