mirror of
https://github.com/Team4388/RidgeScout.git
synced 2026-06-09 00:37:59 -06:00
Some changes
This commit is contained in:
@@ -25,10 +25,10 @@ public class ScoutingDataWriter {
|
||||
for(int i = 0; i < data.length; i++){
|
||||
switch (data[i].getValueType()){
|
||||
case NUM:
|
||||
bb.addInt((int) data[i].get());
|
||||
bb.addInt((int) data[i].forceGetValue());
|
||||
break;
|
||||
case STRING:
|
||||
bb.addString((String) data[i].get());
|
||||
bb.addString((String) data[i].forceGetValue());
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -62,12 +62,12 @@ public class ScoutingDataWriter {
|
||||
for(int i = 0; i < values[version].length; i++){
|
||||
switch (objects.get(i+2).getType()){
|
||||
case 1:
|
||||
dataTypes[i] = new intType(values[version][i].name, (int) objects.get(i+2).get());
|
||||
dataTypes[i] = intType.newNull(values[version][i].name);
|
||||
dataTypes[i].forceSetValue(objects.get(i+2).get());
|
||||
break;
|
||||
case 2:
|
||||
String name = values[version][i].name;
|
||||
String value = (String) objects.get(i+2).get();
|
||||
dataTypes[i] = new stringType(name, value);
|
||||
dataTypes[i] = stringType.newNull(values[version][i].name);
|
||||
dataTypes[i].forceSetValue(objects.get(i+2).get());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ public class fields {
|
||||
new sliderType("Overall Driving Performance", 5, 1, 10),
|
||||
new textType("Overall Driving Comments", "None"),
|
||||
new sliderType("Score area (AMP <-> Speaker)", 5, 1, 10),
|
||||
new dropdownType("End Condition", new String[]{"Nothing", "Attempted Climb", "Successful Climbed", "Climbed with multiple robots", "Climbed with trapz"}, 1),
|
||||
new dropdownType("End Condition", new String[]{"Nothing", "Attempted Climb", "Successful Climbed", "Climbed with multiple robots", "Climbed with trap"}, 1),
|
||||
new dropdownType("Robot Condition", new String[]{"Everything was working", "Something seemed to be broken", "Something was broken", "Missing robot (Joe Johnson)"}, 1),
|
||||
new textType("Other Comments", "None")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user