Clean up the labels on the graph.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@269 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java b/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java
index ae10b90c19af52665bc13153fa3cf6a4bacd7a4a..d91e1351639535e2cc4bec2200eeda1b3de29558 100644 (file)
--- a/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java
+++ b/src/net/sf/openrocket/android/simulation/SimulationPlotFragment.java
@@ -81,8 +81,8 @@ public class SimulationPlotFragment extends Fragment implements OnTouchListener
                mySimpleXYPlot.setUserDomainOrigin(0);\r
                mySimpleXYPlot.setUserRangeOrigin(0);\r
                mySimpleXYPlot.setRangeLabel("");\r
-               mySimpleXYPlot.setDomainLabel(FlightDataType.TYPE_TIME.getUnitGroup().getDefaultUnit().toString());\r
-               mySimpleXYPlot.setRangeLabel( selectedSeries.getUnitGroup().getDefaultUnit().toString() ); \r
+               mySimpleXYPlot.setDomainLabel(FlightDataType.TYPE_TIME.getName() + " (" + FlightDataType.TYPE_TIME.getUnitGroup().getDefaultUnit().toString() + ")");\r
+               mySimpleXYPlot.setRangeLabel( selectedSeries.getName() + " (" + selectedSeries.getUnitGroup().getDefaultUnit().toString() + ")"); \r
                mySimpleXYPlot.disableAllMarkup();\r
 \r
                for ( FlightEvent event : eventsToShow ) {\r
@@ -109,7 +109,7 @@ public class SimulationPlotFragment extends Fragment implements OnTouchListener
                }\r
                Log.d("plot","data = " + yvals.toString());\r
 \r
-               mySeries = new SimpleXYSeries(xvals, yvals, FlightDataType.TYPE_ALTITUDE.toString());\r
+               mySeries = new SimpleXYSeries(xvals, yvals, selectedSeries.toString());\r
 \r
                mySimpleXYPlot.addSeries(mySeries, LineAndPointRenderer.class,\r
                                new LineAndPointFormatter(Color.rgb(0, 255, 0), Color.rgb(200, 0, 0), null));\r