summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f910efa)
git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@346
180e2498-e6e9-4542-8430-
84ac67f01cd8
android:layout_height="match_parent"
android:orientation="vertical" >
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"
<TabHost
android:id="@+id/simulationConfigurationForm"
android:layout_width="fill_parent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true" />
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>
</LinearLayout>
</FrameLayout>
</LinearLayout>
private FlightDataType series2;\r
private final FlightDataType time = FlightDataType.TYPE_TIME;\r
private List<FlightEvent> flightEvents;\r
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
\r
// Define 4 different colors and point styles to use for the series.\r
// For now only 2 series are supported though.\r
private final static PointStyle[] styles = new PointStyle[] { PointStyle.CIRCLE, PointStyle.DIAMOND,\r
PointStyle.TRIANGLE, PointStyle.SQUARE };\r
\r
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
/**\r
* @param flightDataBranch the flightDataBranch to set\r
*/\r
renderer.setYLabels(10);\r
renderer.setShowGrid(true);\r
renderer.setZoomButtonsVisible(true);\r
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
\r
renderer.setMargins(new int[] { 50, 30, 0, 20 });\r
{\r
eventList = (ListView) findViewById(R.id.simulationEventsList);\r
\r
// Initialize the eventList\r
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
\r
@Override\r
public View getView(int position, View convertView,\r
View v = convertView;\r
if ( v == null ) {\r
LayoutInflater li = getLayoutInflater();\r
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
}\r
FlightEvent event = this.getItem(position);\r
((TextView)v.findViewById(android.R.id.text1)).setText( event.getType().toString() + " " + event.getTime() + " (s)" );\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
eventList.setAdapter(events);\r
\r
series1Spinner = (Spinner) findViewById(R.id.simulationSeries1);\r
Log.d(TAG,"series2 = " + series2.toString());\r
\r
SimulationChart chart = new SimulationChart();\r
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
chart.setFlightDataBranch(data);\r
chart.setSeries1(series1);\r
chart.setSeries2(series2);\r