Show the simulation name as the chart title. Made some UI concessions because drawin...

[debian/openrocket] / android / src / net / sf / openrocket / android / simulation / SimulationViewer.java

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java
index 3746cb5fc69655679a3885c00ce5074380bd4477..4f43a23e378768ccaef9a425a5d923dd7531e4a5 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java
@@ -63,7 +63,7 @@ public class SimulationViewer extends Activity {
                eventList = (ListView) findViewById(R.id.simulationEventsList);\r
 \r
                // Initialize the eventList\r
-               ArrayAdapter<FlightEvent> events = new ArrayAdapter<FlightEvent>(this,android.R.layout.simple_list_item_multiple_choice,data.getEvents()) {\r
+               ArrayAdapter<FlightEvent> events = new ArrayAdapter<FlightEvent>(this,android.R.layout.simple_list_item_1,data.getEvents()) {\r
 \r
                        @Override\r
                        public View getView(int position, View convertView,\r
@@ -71,7 +71,7 @@ public class SimulationViewer extends Activity {
                                View v = convertView;\r
                                if ( v == null ) {\r
                                        LayoutInflater li = getLayoutInflater();\r
-                                       v = li.inflate(android.R.layout.simple_list_item_multiple_choice,null);\r
+                                       v = li.inflate(android.R.layout.simple_list_item_1,null);\r
                                }\r
                                FlightEvent event = this.getItem(position);\r
                                ((TextView)v.findViewById(android.R.id.text1)).setText( event.getType().toString() + " " + event.getTime() + " (s)" );\r
@@ -79,7 +79,7 @@ public class SimulationViewer extends Activity {
                        }\r
 \r
                };\r
-               eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);\r
+               //eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);\r
                eventList.setAdapter(events);\r
 \r
                series1Spinner = (Spinner) findViewById(R.id.simulationSeries1);\r
@@ -131,6 +131,7 @@ public class SimulationViewer extends Activity {
                Log.d(TAG,"series2 = " + series2.toString());\r
 \r
                SimulationChart chart = new SimulationChart();\r
+               chart.setSimulationName( sim.getName() );\r
                chart.setFlightDataBranch(data);\r
                chart.setSeries1(series1);\r
                chart.setSeries2(series2);\r