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

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

diff --git a/android/res/layout/simulation_detail.xml b/android/res/layout/simulation_detail.xml
index 88c3649bbb93c39202165839b32c77667838b286..c612fda705e97bd1d2fdb4d176dc1f8f7447e217 100644 (file)
--- a/android/res/layout/simulation_detail.xml
+++ b/android/res/layout/simulation_detail.xml
@@ -4,12 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="draw"
-        android:text="Draw" />
-
     <TabHost
         android:id="@+id/simulationConfigurationForm"
         android:layout_width="fill_parent"
@@ -63,6 +57,12 @@
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:drawSelectorOnTop="true" />
+
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:onClick="draw"
+                        android:text="Draw" />
                 </LinearLayout>
             </FrameLayout>
         </LinearLayout>

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
index 20bab823c2708a6f7fe8ce514aa35260548d4b69..d1301db1c30c7ea42ae5a97363c5772976553ba8 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
@@ -48,6 +48,7 @@ public class SimulationChart {
        private FlightDataType series2;\r
        private final FlightDataType time = FlightDataType.TYPE_TIME;\r
        private List<FlightEvent> flightEvents;\r
+       private String simulationName;\r
 \r
        // Define 4 different colors and point styles to use for the series.\r
        // For now only 2 series are supported though.\r
@@ -55,6 +56,13 @@ public class SimulationChart {
        private final static PointStyle[] styles = new PointStyle[] { PointStyle.CIRCLE, PointStyle.DIAMOND,\r
                PointStyle.TRIANGLE, PointStyle.SQUARE };\r
 \r
+       /**\r
+        * @param simulationName the simulationName to set\r
+        */\r
+       public void setSimulationName(String simulationName) {\r
+               this.simulationName = simulationName;\r
+       }\r
+\r
        /**\r
         * @param flightDataBranch the flightDataBranch to set\r
         */\r
@@ -116,7 +124,7 @@ public class SimulationChart {
                renderer.setYLabels(10);\r
                renderer.setShowGrid(true);\r
                renderer.setZoomButtonsVisible(true);\r
-               renderer.setChartTitle("Simulation");\r
+               renderer.setChartTitle(simulationName);\r
 \r
                renderer.setMargins(new int[] { 50, 30, 0, 20 });\r
                {\r

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