diff --git a/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class b/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class
index f3d2d27..4c67944 100644
Binary files a/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class and b/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class differ
diff --git a/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class b/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class
index e3770c2..55cb9a9 100644
Binary files a/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class and b/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class differ
diff --git a/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class b/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class
index 6ea3f90..ed68ee9 100644
Binary files a/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class and b/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class differ
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/data/EventReport.java b/src/main/java/org/usfirst/frc/team25/scouting/client/data/EventReport.java
index 9f7fbd0..384a9a8 100644
--- a/src/main/java/org/usfirst/frc/team25/scouting/client/data/EventReport.java
+++ b/src/main/java/org/usfirst/frc/team25/scouting/client/data/EventReport.java
@@ -63,13 +63,13 @@ public void processTeamReports(){
TeamReport report = teamReports.get(key);
if(teamNameList!=null){
report.autoGetTeamName(teamNameList);
- System.out.println(key);
+
}
report.calculateStats();
teamReports.put(key, report);
- System.out.println(report.totalCycles.get(0));
+
}
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/data/TeamReport.java b/src/main/java/org/usfirst/frc/team25/scouting/client/data/TeamReport.java
index 6139263..e0d5f43 100644
--- a/src/main/java/org/usfirst/frc/team25/scouting/client/data/TeamReport.java
+++ b/src/main/java/org/usfirst/frc/team25/scouting/client/data/TeamReport.java
@@ -240,8 +240,21 @@ public int getTeamNum(){
return teamNum;
}
+ String removeCommasAndBreaks(String s){
+ String newString = "";
+ for(int i = 0; i < s.length(); i++) {
+ if(s.charAt(i)!=','&&s.charAt(i)!='\n')
+ newString += s.charAt(i);
+ else newString+="; ";
+ }
+ return newString;
+ }
+
public void addEntry(ScoutEntry entry){
+ entry.getPostMatch().setRobotComment(removeCommasAndBreaks(entry.getPostMatch().getRobotComment()));
+
+ entry.getPostMatch().setPilotComment(removeCommasAndBreaks(entry.getPostMatch().getPilotComment()));
entries.add(entry);
}
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Window.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Window.java
index e9623cb..ddb04d5 100644
--- a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Window.java
+++ b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Window.java
@@ -124,7 +124,7 @@ public static JFrame addIcon(JFrame frame){
public static void initialize(){
- JLabel introText = new JLabel("Team 25 Scouting Client
Press start to select data folder");
+ JLabel introText = new JLabel("Team 25 Scouting Client - v1.11
Press start to select data folder");
introText.setHorizontalAlignment(JLabel.CENTER);
introText.setFont(new Font("Arial", Font.PLAIN, 16));