summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9e426c0)
git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@969
180e2498-e6e9-4542-8430-
84ac67f01cd8
\r
import java.io.Serializable;\r
import java.util.ArrayList;\r
\r
import java.io.Serializable;\r
import java.util.ArrayList;\r
-import java.util.HashMap;\r
\r
import net.sf.openrocket.android.util.AndroidLogWrapper;\r
import net.sf.openrocket.document.OpenRocketDocument;\r
\r
import net.sf.openrocket.android.util.AndroidLogWrapper;\r
import net.sf.openrocket.document.OpenRocketDocument;\r
private final int simulationIndex;\r
private transient FlightDataType series1;\r
private transient FlightDataType series2;\r
private final int simulationIndex;\r
private transient FlightDataType series1;\r
private transient FlightDataType series2;\r
- private transient Map<Double,String> events;\r
+ private transient List<FlightEvent> events;\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
this.series1 = series1;\r
}\r
\r
this.series1 = series1;\r
}\r
\r
+ public FlightDataType getSeries1() {\r
+ return series1;\r
+ }\r
+\r
public void setSeries2(FlightDataType series2) {\r
this.series2 = series2;\r
}\r
\r
public void setSeries2(FlightDataType series2) {\r
this.series2 = series2;\r
}\r
\r
- public void setEvents( Map<Double,String> events ) {\r
+ public FlightDataType getSeries2() {\r
+ return series2;\r
+ }\r
+\r
+ public void setEvents( List<FlightEvent> events ) {\r
this.events = events;\r
}\r
\r
this.events = events;\r
}\r
\r
+ public List<FlightEvent> getEvents() {\r
+ return events;\r
+ }\r
+\r
public FlightDataBranch getFlightDataBranch( OpenRocketDocument rocketDocument ) {\r
Simulation sim = rocketDocument.getSimulation(simulationIndex);\r
FlightDataBranch flightDataBranch = sim.getSimulatedData().getBranch(0);\r
public FlightDataBranch getFlightDataBranch( OpenRocketDocument rocketDocument ) {\r
Simulation sim = rocketDocument.getSimulation(simulationIndex);\r
FlightDataBranch flightDataBranch = sim.getSimulatedData().getBranch(0);\r
}\r
\r
if ( events == null ) {\r
}\r
\r
if ( events == null ) {\r
- events = new HashMap<Double,String>();\r
+ events = new ArrayList<FlightEvent>();\r
for ( FlightEvent event : flightDataBranch.getEvents() ) {\r
for ( FlightEvent event : flightDataBranch.getEvents() ) {\r
- events.put(event.getTime(), event.getType().toString() );\r
renderer.setShowCustomTextGrid(true);\r
renderer.setXLabelsAlign(Align.RIGHT);\r
renderer.setXLabelsAngle(90); // rotate right\r
renderer.setShowCustomTextGrid(true);\r
renderer.setXLabelsAlign(Align.RIGHT);\r
renderer.setXLabelsAngle(90); // rotate right\r
- for( Map.Entry<Double,String> event : events.entrySet() ) {\r
- renderer.addXTextLabel(event.getKey(), event.getValue());\r
+ for( FlightEvent event : events ) {\r
+ renderer.addXTextLabel(event.getTime(), event.getType().toString());\r
}\r
\r
renderer.setMargins(new int[] { 50, 30, 0, 20 });\r
}\r
\r
renderer.setMargins(new int[] { 50, 30, 0, 20 });\r
package net.sf.openrocket.android.simulation;\r
\r
import java.util.ArrayList;\r
package net.sf.openrocket.android.simulation;\r
\r
import java.util.ArrayList;\r
-import java.util.HashMap;\r
\r
import net.sf.openrocket.R;\r
import net.sf.openrocket.android.CurrentRocketHolder;\r
\r
import net.sf.openrocket.R;\r
import net.sf.openrocket.android.CurrentRocketHolder;\r
\r
@Override\r
public void onClick(View v) {\r
\r
@Override\r
public void onClick(View v) {\r
- Map<Double,String> eventsToShow = new HashMap<Double,String>();\r
+ List<FlightEvent> eventsToShow = new ArrayList<FlightEvent>();\r
{\r
SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions();\r
List<FlightEvent> flightEvents = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument()).getEvents();\r
for( int i=0; i< flightEvents.size(); i++ ) {\r
if ( eventsSelected.get(i) ) {\r
FlightEvent event = flightEvents.get(i);\r
{\r
SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions();\r
List<FlightEvent> flightEvents = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument()).getEvents();\r
for( int i=0; i< flightEvents.size(); i++ ) {\r
if ( eventsSelected.get(i) ) {\r
FlightEvent event = flightEvents.get(i);\r
- eventsToShow.put( event.getTime(), event.getType().toString());\r
+ eventsToShow.add( event );\r
series2Spinner = (Spinner) v.findViewById(R.id.simulationSeries2);\r
\r
List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();\r
series2Spinner = (Spinner) v.findViewById(R.id.simulationSeries2);\r
\r
List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();\r
for( FlightDataType fdt : chart.getFlightDataBranch(rocketDocument).getTypes() ) {\r
if ( fdt == FlightDataType.TYPE_TIME ) { \r
for( FlightDataType fdt : chart.getFlightDataBranch(rocketDocument).getTypes() ) {\r
if ( fdt == FlightDataType.TYPE_TIME ) { \r
} else {\r
selectableSeries.add(fdt);\r
}\r
} else {\r
selectableSeries.add(fdt);\r
}\r
}\r
ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {\r
\r
}\r
ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {\r
\r
series1Spinner.setAdapter(serieses);\r
series1Spinner.setAdapter(serieses);\r
- series1Spinner.setSelection(0);\r
+ int selection1 = serieses.getPosition(chart.getSeries1());\r
+ series1Spinner.setSelection(selection1);\r
series2Spinner.setAdapter(serieses);\r
series2Spinner.setAdapter(serieses);\r
- series2Spinner.setSelection(1);\r
+ int selection2 = serieses.getPosition(chart.getSeries2());\r
+ series2Spinner.setSelection(selection2);\r
\r
eventList = (ListView) v.findViewById(R.id.simulationEventsList);\r
\r
\r
eventList = (ListView) v.findViewById(R.id.simulationEventsList);\r
\r
eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);\r
eventList.setAdapter(events);\r
\r
eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);\r
eventList.setAdapter(events);\r
\r
+ for( FlightEvent evt : chart.getEvents() ) {\r
+ eventList.setItemChecked( events.getPosition(evt), true);\r
+ }\r
+ \r
return builder.create();\r
\r
}\r
return builder.create();\r
\r
}\r