Merge pull request #207 from ajayyy/improvements

Setup auto to include the field UI as well

Author: ajayyy

app/src/main/java/ca/lakeeffect/scoutingapp/Field.java

@@ -146,7 +146,7 @@ public void surfaceDestroyed(SurfaceHolder holder) {
         });
     }
 
-    // called by the TeleopPage class when the deselect button is hit
+    // called by the FieldUIPage class when the deselect button is hit
     public void deselect(){
         Canvas c = surface.getHolder().lockCanvas();
 

…a/lakeeffect/scoutingapp/TeleopPage.java …/lakeeffect/scoutingapp/FieldUIPage.javaapp/src/main/java/ca/lakeeffect/scoutingapp/TeleopPage.java renamed to app/src/main/java/ca/lakeeffect/scoutingapp/FieldUIPage.java app/src/main/java/ca/lakeeffect/scoutingapp/TeleopPage.java renamed to app/src/main/java/ca/lakeeffect/scoutingapp/FieldUIPage.java

@@ -23,7 +23,7 @@
 /**
  * Created by Ajay on 9/25/2016.
  */
-public class TeleopPage extends Fragment implements View.OnClickListener {
+public class FieldUIPage extends Fragment implements View.OnClickListener {
 
     SurfaceView surface;
     Field field;
@@ -46,22 +46,21 @@ public class TeleopPage extends Fragment implements View.OnClickListener {
     boolean hasVibrator;
 
     @Override
-    public void onCreate(Bundle savedInstanceState){
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle savedInstanceState){
+    public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle savedInstanceState) {
 
-        View view = inflator.inflate(R.layout.teleoppage, container, false);
+        View view = inflator.inflate(R.layout.field_ui_page, container, false);
 
         surface = view.findViewById(R.id.fieldCanvas);
         Bitmap fieldRed = BitmapFactory.decodeResource(getResources(), R.drawable.fieldred);
         Bitmap fieldBlue = BitmapFactory.decodeResource(getResources(), R.drawable.fieldblue);
         field = new Field(surface, fieldRed, fieldBlue);
         surface.setOnTouchListener(field);
 
-
         pickupHatch = view.findViewById(R.id.pickupHatch);
         pickupHatch.setOnClickListener(this);
 
@@ -89,9 +88,6 @@ public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle sa
         failDropCargo = view.findViewById(R.id.failDropCargo);
         failDropCargo.setOnClickListener(this);
 
-
-        view.setTag("page2");
-
         vibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
 
         hasVibrator = vibrator.hasVibrator();
@@ -101,20 +97,15 @@ public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle sa
 
     @Override
     public void onClick(View v) {
-
-
-
-        if(v == undo){
-
-            if(events.size() > 0){
-
-                Event event = events.get(events.size()-1);
+        if (v == undo) {
+            if (events.size() > 0) {
+                Event event = events.get(events.size() - 1);
 
                 String location = "";
 
-                if(field.selected != -1) {
+                if (field.selected != -1) {
                     location += "location " + field.selected;
-                } else{
+                } else {
                     location += "the field";
                 }
 
@@ -123,7 +114,7 @@ public void onClick(View v) {
                         .setMessage("Are you sure you would like to undo the action that said " + getActionText(event.eventType) + location + "?")
                         .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
-                                events.remove(events.size()-1);
+                                events.remove(events.size() - 1);
                             }
                         })
                         .setNegativeButton("No", null)
@@ -136,75 +127,70 @@ public void onClick(DialogInterface dialog, int which) {
             return; //only have to undo, not add an event
         }
 
-
         //Vibrate the vibrator to notify scout
-        if(hasVibrator) vibrator.vibrate(new long[] {0, 100, 25, 100}, -1);
+        if (hasVibrator) vibrator.vibrate(new long[]{0, 100, 25, 100}, -1);
 
         final Event event;
         int eventType = -1;
 
         String action = "";
 
         //hatch eventTypes are from 0-3, cargo eventTypes are from 4-7
-        if(v == pickupHatch) {
+        if (v == pickupHatch) {
             eventType = 0;
-        } else if(v == failPickupHatch) {
+        } else if (v == failPickupHatch) {
             eventType = 1;
-        } else if(v == dropHatch){
+        } else if (v == dropHatch) {
             eventType = 2;
-        } else if(v == failDropHatch) {
+        } else if (v == failDropHatch) {
             eventType = 3;
-        } else if(v == pickupCargo) {
+        } else if (v == pickupCargo) {
             eventType = 4;
-        } else if(v == failPickupCargo) {
+        } else if (v == failPickupCargo) {
             eventType = 5;
-        } else if(v == dropCargo) {
+        } else if (v == dropCargo) {
             eventType = 6;
-        } else if(v == failDropCargo) {
+        } else if (v == failDropCargo) {
             eventType = 7;
         }
 
-
-
         action = getActionText(eventType);
 
-        if(field.selected != -1) {
+        if (field.selected != -1) {
             action += "location " + field.selected;
-        } else{
+        } else {
             action += "the field";
         }
 
-        if(eventType != -1) {
+        if (eventType != -1) {
             final String a = action;
             event = new Event(eventType, field.selected, System.currentTimeMillis(), 0);
             if (hasVibrator) {
                 addEvent(event, action, true);
-            }
-            else{
+            } else {
                 addEvent(event, a, false);
             }
         }
     }
 
-    private void addEvent(Event e, String action, boolean makeToast){
+    private void addEvent(Event e, String action, boolean makeToast) {
         events.add(e);
 
-        if(makeToast){
-            Toast.makeText(getContext(), "Event "+action+" recorded", Toast.LENGTH_SHORT).show();
+        if (makeToast) {
+            Toast.makeText(getContext(), "Event " + action + " recorded", Toast.LENGTH_SHORT).show();
         }
     }
 
-
-    public String getActionText(int eventType){
+    public String getActionText(int eventType) {
         String item = "hatch";
-        if(eventType > 3){
+        if (eventType > 3) {
             //this converts it to as if it was a hatch event, as they have the same
             // messages other than the different item
             eventType -= 4;
             item = "cargo";
         }
 
-        switch (eventType){
+        switch (eventType) {
             case 0:
                 return "that the robot picked up a " + item + " from ";
             case 1:
@@ -217,11 +203,11 @@ public String getActionText(int eventType){
         return "invalid event";
     }
 
-    public void reset(){
+    public void reset() {
         events.clear();
     }
 
-    public String[] getData(){
+    public String[] getData() {
         StringBuilder labels = new StringBuilder();
         StringBuilder data = new StringBuilder();
 
@@ -239,58 +225,58 @@ public String[] getData(){
 
         String[] labelActions = {"Hatch Hit", "Hatch Miss", "Cargo Hit", "Cargo Miss"};
 
-        for(Event e : events){
+        for (Event e : events) {
             int location = e.location;
 
             int id = 0;
-            switch(e.eventType){
+            switch (e.eventType) {
                 case 2:
                     //eventType 2: dropHatch
-                    id=0;
+                    id = 0;
                     System.out.println("2");
                     break;
 
                 case 3:
                     //eventType 3: failDropHatch
-                    id=1;
+                    id = 1;
                     System.out.println("3");
                     break;
 
                 case 6:
                     //eventType 6: dropCargo
                     System.out.println("6");
-                    id=2;
+                    id = 2;
                     break;
 
                 case 7:
                     //eventType 7: failDropCargo
                     System.out.println("7");
-                    id=3;
+                    id = 3;
                     break;
 
                 default:
                     System.out.println(e.eventType);
                     break;
             }
 
-            if(MainActivity.arrayContains(cargoShipLocations, location)){
-                cargoShip[id] ++;
+            if (MainActivity.arrayContains(cargoShipLocations, location)) {
+                cargoShip[id]++;
             }
-            if(MainActivity.arrayContains(levelOneRocketLocations, location)){
-                levelOneRocket[id] ++;
-                fullRocket[id] ++;
+            if (MainActivity.arrayContains(levelOneRocketLocations, location)) {
+                levelOneRocket[id]++;
+                fullRocket[id]++;
             }
-            if(MainActivity.arrayContains(levelTwoRocketLocations, location)){
-                levelTwoRocket[id] ++;
-                fullRocket[id] ++;
+            if (MainActivity.arrayContains(levelTwoRocketLocations, location)) {
+                levelTwoRocket[id]++;
+                fullRocket[id]++;
             }
-            if(MainActivity.arrayContains(levelThreeRocketLocations, location)){
-                levelThreeRocket[id] ++;
-                fullRocket[id] ++;
+            if (MainActivity.arrayContains(levelThreeRocketLocations, location)) {
+                levelThreeRocket[id]++;
+                fullRocket[id]++;
             }
         }
 
-        for(int i = 0; i<labelActions.length; i++){
+        for (int i = 0; i < labelActions.length; i++) {
             labels.append("Cargo ship " + labelActions[i] + ",");
             data.append(cargoShip[i] + ",");
             labels.append("Level 1 rocket " + labelActions[i] + ",");
@@ -301,10 +287,9 @@ public String[] getData(){
             data.append(levelThreeRocket[i] + ",");
             labels.append("Full rocket " + labelActions[i] + ",");
             data.append(fullRocket[i] + ",");
-
         }
 
-        return(new String[] {labels.toString(), data.toString()});
+        return (new String[]{labels.toString(), data.toString()});
 
     }
 

app/src/main/java/ca/lakeeffect/scoutingapp/InputPagerAdapter.java

@@ -11,18 +11,20 @@
  */
 public class InputPagerAdapter extends FragmentStatePagerAdapter {
 
-    final int PAGENUM = 4;
+    final int PAGENUM = 5;
 
     public PregamePage pregamePage;
-    public TeleopPage teleopPage;
+    public FieldUIPage autoPage;
+    public FieldUIPage teleopPage;
     public PostgamePage postgamePage;
     public QualitativePage qualitativePage;
 
     //Instatiate pages
     public InputPagerAdapter(FragmentManager fm) {
         super(fm);
         pregamePage = new PregamePage();
-        teleopPage = new TeleopPage();
+        autoPage = new FieldUIPage();
+        teleopPage = new FieldUIPage();
         postgamePage = new PostgamePage();
         qualitativePage = new QualitativePage();
     }
@@ -35,12 +37,15 @@ public Fragment getItem(int position) {
                 pregamePage = new PregamePage();
                 return pregamePage;
             case 1:
-                teleopPage = new TeleopPage();
-                return teleopPage;
+                autoPage = new FieldUIPage();
+                return autoPage;
             case 2:
+                teleopPage = new FieldUIPage();
+                return teleopPage;
+            case 3:
                 postgamePage = new PostgamePage();
                 return postgamePage;
-            case 3:
+            case 4:
                 qualitativePage = new QualitativePage();
                 return qualitativePage;
         }
@@ -59,10 +64,12 @@ public CharSequence getPageTitle(int position) {
             case 0:
                 return "Pre-Game";
             case 1:
-                return "TeleOp Round";
+                return "Autonomous Period";
             case 2:
-                return "Post-Game";
+                return "TeleOp Period";
             case 3:
+                return "Post-Game";
+            case 4:
                 return "Qualitative";
         }
         return "";