From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Tue, 3 Jan 2012 19:01:41 +0000 (+0000)
Subject: Clean up the labels on the graph.
X-Git-Tag: upstream/12.03~1^2~201
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1efd398f69371a44fe23ee2293c8f43073776ac7;p=debian%2Fopenrocket

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 ae10b90c..d91e1351 100644
--- 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);
 		mySimpleXYPlot.setUserRangeOrigin(0);
 		mySimpleXYPlot.setRangeLabel("");
-		mySimpleXYPlot.setDomainLabel(FlightDataType.TYPE_TIME.getUnitGroup().getDefaultUnit().toString());
-		mySimpleXYPlot.setRangeLabel( selectedSeries.getUnitGroup().getDefaultUnit().toString() ); 
+		mySimpleXYPlot.setDomainLabel(FlightDataType.TYPE_TIME.getName() + " (" + FlightDataType.TYPE_TIME.getUnitGroup().getDefaultUnit().toString() + ")");
+		mySimpleXYPlot.setRangeLabel( selectedSeries.getName() + " (" + selectedSeries.getUnitGroup().getDefaultUnit().toString() + ")"); 
 		mySimpleXYPlot.disableAllMarkup();
 
 		for ( FlightEvent event : eventsToShow ) {
@@ -109,7 +109,7 @@ public class SimulationPlotFragment extends Fragment implements OnTouchListener
 		}
 		Log.d("plot","data = " + yvals.toString());
 
-		mySeries = new SimpleXYSeries(xvals, yvals, FlightDataType.TYPE_ALTITUDE.toString());
+		mySeries = new SimpleXYSeries(xvals, yvals, selectedSeries.toString());
 
 		mySimpleXYPlot.addSeries(mySeries, LineAndPointRenderer.class,
 				new LineAndPointFormatter(Color.rgb(0, 255, 0), Color.rgb(200, 0, 0), null));