Release: Removing unfinished/untested missionItems for the release

DroidPlanner · Feb 25, 2014 · 9bcbb3d · 9bcbb3d
1 parent 1fd0b41
commit 9bcbb3d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionItemTypes.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionItemTypes.java
@@ -3,24 +3,20 @@
 import java.security.InvalidParameterException;
 
 import org.droidplanner.drone.variables.mission.MissionItem;
-import org.droidplanner.drone.variables.mission.commands.ReturnToHome;
 import org.droidplanner.drone.variables.mission.waypoints.Land;
-import org.droidplanner.drone.variables.mission.waypoints.LoiterTime;
-import org.droidplanner.drone.variables.mission.waypoints.LoiterTurns;
-import org.droidplanner.drone.variables.mission.waypoints.RegionOfInterest;
 import org.droidplanner.drone.variables.mission.waypoints.Takeoff;
 import org.droidplanner.drone.variables.mission.waypoints.Waypoint;
 
 
 public enum MissionItemTypes {
 		WAYPOINT("Waypoint"),
 		TAKEOFF("Takeoff"),
-		RTL("Return to Launch"),
+		//RTL("Return to Launch"),
 		LAND("Land"),
-		LOITERN("Circle"),
-		LOITERT("Loiter"),
+		//LOITERN("Circle"),
+		//LOITERT("Loiter"),
 		//LOITER("Loiter indefinitly"),
-		ROI("Region of Interest"),
+		//ROI("Region of Interest"),
 		SURVEY("Survey");
 
 	private final String name;
@@ -37,8 +33,9 @@ public MissionItem getNewItem(MissionItem item) throws InvalidItemException {
 		switch (this) {
 		case LAND:
 			return new Land(item);
-		//case LOITER:
-		//	return new LoiterInfinite(item);
+		/*
+		case LOITER:
+			return new LoiterInfinite(item);
 		case LOITERN:
 			return new LoiterTurns(item);
 		case LOITERT:
@@ -47,6 +44,7 @@ public MissionItem getNewItem(MissionItem item) throws InvalidItemException {
 			return new RegionOfInterest(item);
 		case RTL:
 			return new ReturnToHome(item);
+		*/
 		case TAKEOFF:
 			return new Takeoff(item);
 		case WAYPOINT:

diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java
@@ -30,7 +30,7 @@ protected int getResource() {
 	@Override
 	protected void setupViews(View view) {
 		super.setupViews(view);
-		typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.LOITERN));
+		//typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.LOITERN));
 
 		LoiterTurns item = (LoiterTurns) this.item;
 

diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java
@@ -26,7 +26,7 @@ protected int getResource() {
 	@Override
 	protected void setupViews(View view) {
 		super.setupViews(view);
-		typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.LOITERT));
+		//typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.LOITERT));
 
 		LoiterTime item = (LoiterTime) this.item;
 

diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java
@@ -19,7 +19,7 @@ protected int getResource() {
 	@Override
 	protected void setupViews(View view) {
 		super.setupViews(view);
-		typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.RTL));
+		//typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.RTL));
 
 		//altitudeSeekBar = (SeekBarWithText) view.findViewById(R.id.altitudeView);
 		//altitudeSeekBar.setValue(((ReturnToHome) item).getHeight().valueInMeters());

diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java
@@ -22,8 +22,7 @@ protected int getResource() {
 	@Override
 	protected void setupViews(View view) {
 		super.setupViews(view);
-		typeSpinner.setSelection(commandAdapter
-				.getPosition(MissionItemTypes.ROI));
+		//typeSpinner.setSelection(commandAdapter.getPosition(MissionItemTypes.ROI));
 
 		altitudeSeekBar = (SeekBarWithText) view.findViewById(R.id.altitudeView);
 		altitudeSeekBar.setValue(((RegionOfInterest) item).getAltitude().valueInMeters());