From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sat, 30 Jun 2012 19:16:34 +0000 (+0000)
Subject: Refactor.  Rename SimulationSeriesDialog to SimulationPlotConfigDialog.  Change names... 
X-Git-Tag: upstream/12.09^2~138
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d2c81aff1c01c3140cbaa5e2eb96f88e4586048c;p=debian%2Fopenrocket

Refactor.  Rename SimulationSeriesDialog to SimulationPlotConfigDialog.  Change names of layouts accordingly.

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

diff --git a/android/res/layout/simulation_plot_config_dialog.xml b/android/res/layout/simulation_plot_config_dialog.xml
new file mode 100644
index 00000000..d3af9014
--- /dev/null
+++ b/android/res/layout/simulation_plot_config_dialog.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/simulationSeries1Label" />
+
+    <Spinner
+        android:id="@+id/simulationSeries1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawSelectorOnTop="true" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/simulationSeries2Label" />
+
+    <Spinner
+        android:id="@+id/simulationSeries2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawSelectorOnTop="true" />
+
+    <ListView
+        android:id="@+id/simulationEventsList"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/simulationOkButton"
+        android:layout_width="70dp"
+        android:layout_height="45dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/plot" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/simulation_plot_config_event_list_item.xml b/android/res/layout/simulation_plot_config_event_list_item.xml
new file mode 100644
index 00000000..19eb9f2b
--- /dev/null
+++ b/android/res/layout/simulation_plot_config_event_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:textAppearance="?android:attr/textAppearanceListItem"
+    android:gravity="center_vertical"
+    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+    android:paddingLeft="8dip"
+    android:paddingRight="8dip"
+/>
diff --git a/android/res/layout/simulation_series_dialog.xml b/android/res/layout/simulation_series_dialog.xml
deleted file mode 100644
index 2f231db6..00000000
--- a/android/res/layout/simulation_series_dialog.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <!-- shim to get dialog correct size ?? -->
-    <!--
-    <View
-        android:layout_width="200dp"
-        android:layout_height="0px"
-        android:layout_margin="0px"
-        android:orientation="horizontal" />
-    -->
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/simulationSeries1Label" />
-
-    <Spinner
-        android:id="@+id/simulationSeries1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawSelectorOnTop="true" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/simulationSeries2Label" />
-
-    <Spinner
-        android:id="@+id/simulationSeries2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawSelectorOnTop="true" />
-
-    <ListView
-        android:id="@+id/simulationEventsList"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <Button
-        android:id="@+id/simulationOkButton"
-        android:layout_width="70dp"
-        android:layout_height="45dp"
-        android:layout_gravity="center_horizontal"
-        android:text="ok" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/simulation_series_event_list_item.xml b/android/res/layout/simulation_series_event_list_item.xml
deleted file mode 100644
index 19eb9f2b..00000000
--- a/android/res/layout/simulation_series_event_list_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:textAppearance="?android:attr/textAppearanceListItem"
-    android:gravity="center_vertical"
-    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip"
-/>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index fae70a50..b57930fd 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="select_series">Change Plot</string>
     <string name="view_events">View Events</string>
     <string name="simulationPlotDialogTitle">Select Series And Events</string>
+    <string name="plot">Plot</string>
 
     <string-array name="PreferenceMotorBrowserGroupingEntries">
         <item>Case</item>
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java
new file mode 100644
index 00000000..5f34a21f
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java
@@ -0,0 +1,160 @@
+package net.sf.openrocket.android.simulation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.android.CurrentRocketHolder;
+import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.simulation.FlightDataBranch;
+import net.sf.openrocket.simulation.FlightDataType;
+import net.sf.openrocket.simulation.FlightEvent;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.util.SparseBooleanArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class SimulationPlotConfigDialog extends DialogFragment {
+	
+	public interface OnConfirmListener {
+		public void onConfirm();
+	}
+
+	private ListView eventList;
+	private Spinner series1Spinner;
+	private Spinner series2Spinner;
+
+	private SimulationChart chart;
+	private OnConfirmListener listener;
+
+	public static SimulationPlotConfigDialog newInstance( SimulationChart chart ) {
+		SimulationPlotConfigDialog d = new SimulationPlotConfigDialog();
+		d.chart = chart;
+		return d;
+	}
+
+	public void setOnConfirmListener(OnConfirmListener listener) {
+		this.listener = listener;
+	}
+
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+		if (savedInstanceState != null ) {
+			chart = (SimulationChart) savedInstanceState.getSerializable("chart");
+		}
+		
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		builder.setTitle(R.string.simulationPlotDialogTitle);
+		
+		final LayoutInflater inflater = getActivity().getLayoutInflater();
+		View v = inflater.inflate(R.layout.simulation_plot_config_dialog, null);
+		builder.setView(v);
+
+		OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument();
+
+		Button okButton = (Button) v.findViewById(R.id.simulationOkButton);
+		okButton.setOnClickListener( new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				Map<Double,String> eventsToShow = new HashMap<Double,String>();
+				{
+					SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions();
+					List<FlightEvent> flightEvents = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument()).getEvents();
+					for( int i=0; i< flightEvents.size(); i++ ) {
+						if ( eventsSelected.get(i) ) {
+							FlightEvent event = flightEvents.get(i);
+							eventsToShow.put( event.getTime(), event.getType().toString());
+						}
+					}
+				}
+				chart.setEvents(eventsToShow);
+
+				chart.setSeries1((FlightDataType)series1Spinner.getSelectedItem());
+				chart.setSeries2((FlightDataType)series2Spinner.getSelectedItem());
+
+				if ( listener != null ) {
+					listener.onConfirm();
+				}
+				SimulationPlotConfigDialog.this.dismiss();
+			}
+			
+		});
+
+		series1Spinner = (Spinner) v.findViewById(R.id.simulationSeries1);
+		series2Spinner = (Spinner) v.findViewById(R.id.simulationSeries2);
+
+		List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();
+		for( FlightDataType fdt : chart.getFlightDataBranch(rocketDocument).getTypes() ) {
+			if ( fdt == FlightDataType.TYPE_TIME ) { 
+
+			} else {
+				selectableSeries.add(fdt);
+			}
+		}
+		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {
+
+			@Override
+			public View getView(int position, View convertView,	ViewGroup parent) {
+				View v = convertView;
+				if ( v == null ) {
+					LayoutInflater li = inflater;
+					v = li.inflate(android.R.layout.simple_spinner_item,null);
+				}
+				FlightDataType fdt = this.getItem(position);
+				((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );
+				return v;
+			}
+
+		};
+		series1Spinner.setAdapter(serieses);
+		series1Spinner.setSelection(0);
+		series2Spinner.setAdapter(serieses);
+		series2Spinner.setSelection(1);
+
+		eventList = (ListView) v.findViewById(R.id.simulationEventsList);
+
+		FlightDataBranch data = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument());
+		// Initialize the eventList
+		
+		ArrayAdapter<FlightEvent> events = new ArrayAdapter<FlightEvent>(getActivity(),android.R.layout.simple_list_item_1,data.getEvents()) {
+
+			@Override
+			public View getView(int position, View convertView,
+					ViewGroup parent) {
+				View v = convertView;
+				if ( v == null ) {
+					LayoutInflater li = inflater;
+					v = li.inflate(android.R.layout.simple_list_item_multiple_choice,null);
+				}
+				FlightEvent event = this.getItem(position);
+				((TextView)v.findViewById(android.R.id.text1)).setText( event.getType().toString() + " " + event.getTime() + " (s)" );
+				return v;
+			}
+
+		};
+		eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+		eventList.setAdapter(events);
+
+		return builder.create();
+
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle arg0) {
+		super.onSaveInstanceState(arg0);
+		arg0.putSerializable("chart", chart);
+	}
+
+}
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
deleted file mode 100644
index 4ed66743..00000000
--- a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package net.sf.openrocket.android.simulation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.openrocket.R;
-import net.sf.openrocket.android.CurrentRocketHolder;
-import net.sf.openrocket.document.OpenRocketDocument;
-import net.sf.openrocket.simulation.FlightDataBranch;
-import net.sf.openrocket.simulation.FlightDataType;
-import net.sf.openrocket.simulation.FlightEvent;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.util.SparseBooleanArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-public class SimulationSeriesDialog extends DialogFragment {
-	
-	public interface OnConfirmListener {
-		public void onConfirm();
-	}
-
-	private ListView eventList;
-	private Spinner series1Spinner;
-	private Spinner series2Spinner;
-
-	private SimulationChart chart;
-	private OnConfirmListener listener;
-
-	public static SimulationSeriesDialog newInstance( SimulationChart chart ) {
-		SimulationSeriesDialog d = new SimulationSeriesDialog();
-		d.chart = chart;
-		return d;
-	}
-
-	public void setOnConfirmListener(OnConfirmListener listener) {
-		this.listener = listener;
-	}
-
-	@Override
-	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		if (savedInstanceState != null ) {
-			chart = (SimulationChart) savedInstanceState.getSerializable("chart");
-		}
-		
-		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		builder.setTitle(R.string.simulationPlotDialogTitle);
-		
-		final LayoutInflater inflater = getActivity().getLayoutInflater();
-		View v = inflater.inflate(R.layout.simulation_series_dialog, null);
-		builder.setView(v);
-
-		OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument();
-
-		Button okButton = (Button) v.findViewById(R.id.simulationOkButton);
-		okButton.setOnClickListener( new View.OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				Map<Double,String> eventsToShow = new HashMap<Double,String>();
-				{
-					SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions();
-					List<FlightEvent> flightEvents = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument()).getEvents();
-					for( int i=0; i< flightEvents.size(); i++ ) {
-						if ( eventsSelected.get(i) ) {
-							FlightEvent event = flightEvents.get(i);
-							eventsToShow.put( event.getTime(), event.getType().toString());
-						}
-					}
-				}
-				chart.setEvents(eventsToShow);
-
-				chart.setSeries1((FlightDataType)series1Spinner.getSelectedItem());
-				chart.setSeries2((FlightDataType)series2Spinner.getSelectedItem());
-
-				if ( listener != null ) {
-					listener.onConfirm();
-				}
-				SimulationSeriesDialog.this.dismiss();
-			}
-			
-		});
-
-		series1Spinner = (Spinner) v.findViewById(R.id.simulationSeries1);
-		series2Spinner = (Spinner) v.findViewById(R.id.simulationSeries2);
-
-		List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();
-		for( FlightDataType fdt : chart.getFlightDataBranch(rocketDocument).getTypes() ) {
-			if ( fdt == FlightDataType.TYPE_TIME ) { 
-
-			} else {
-				selectableSeries.add(fdt);
-			}
-		}
-		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {
-
-			@Override
-			public View getView(int position, View convertView,	ViewGroup parent) {
-				View v = convertView;
-				if ( v == null ) {
-					LayoutInflater li = inflater;
-					v = li.inflate(android.R.layout.simple_spinner_item,null);
-				}
-				FlightDataType fdt = this.getItem(position);
-				((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );
-				return v;
-			}
-
-		};
-		series1Spinner.setAdapter(serieses);
-		series1Spinner.setSelection(0);
-		series2Spinner.setAdapter(serieses);
-		series2Spinner.setSelection(1);
-
-		eventList = (ListView) v.findViewById(R.id.simulationEventsList);
-
-		FlightDataBranch data = chart.getFlightDataBranch(CurrentRocketHolder.getCurrentRocket().getRocketDocument());
-		// Initialize the eventList
-		
-		ArrayAdapter<FlightEvent> events = new ArrayAdapter<FlightEvent>(getActivity(),android.R.layout.simple_list_item_1,data.getEvents()) {
-
-			@Override
-			public View getView(int position, View convertView,
-					ViewGroup parent) {
-				View v = convertView;
-				if ( v == null ) {
-					LayoutInflater li = inflater;
-					v = li.inflate(android.R.layout.simple_list_item_multiple_choice,null);
-				}
-				FlightEvent event = this.getItem(position);
-				((TextView)v.findViewById(android.R.id.text1)).setText( event.getType().toString() + " " + event.getTime() + " (s)" );
-				return v;
-			}
-
-		};
-		eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-		eventList.setAdapter(events);
-
-		return builder.create();
-
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle arg0) {
-		super.onSaveInstanceState(arg0);
-		arg0.putSerializable("chart", chart);
-	}
-
-}
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
index 72f7b0d1..48f70762 100644
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
@@ -21,7 +21,7 @@ import com.actionbarsherlock.view.MenuItem;
 /**
  * An activity that encapsulates a graphical view of the chart.
  */
-public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener {
+public class SimulationViewFragment extends SherlockFragment implements SimulationPlotConfigDialog.OnConfirmListener {
 	
 	SimulationChart chart;
 
@@ -63,7 +63,7 @@ public class SimulationViewFragment extends SherlockFragment implements Simulati
 		switch (item.getItemId())
 		{
 		case R.id.simulation_select_series_menu_option:
-			SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart);
+			SimulationPlotConfigDialog seriesDialog = SimulationPlotConfigDialog.newInstance(chart);
 			seriesDialog.show(getFragmentManager(), "AbraCadaver");
 			seriesDialog.setOnConfirmListener(this);
 			return true;