Added version numbeer, more comment parsing

RaiderRobotix · Feb 24, 2017 · fc0040e · fc0040e
1 parent ad440f8
commit fc0040e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class b/bin/org/usfirst/frc/team25/scouting/client/data/EventReport.class
diff --git a/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class b/bin/org/usfirst/frc/team25/scouting/client/data/TeamReport.class
diff --git a/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class b/bin/org/usfirst/frc/team25/scouting/client/ui/Window.class
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
@@ -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
@@ -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
@@ -124,7 +124,7 @@ public static JFrame addIcon(JFrame frame){
 
 	public static void initialize(){
 
-		JLabel introText = new JLabel("<html><h1>Team 25 Scouting Client</h1><br>Press start to select data folder</html>");
+		JLabel introText = new JLabel("<html><h1>Team 25 Scouting Client - v1.11</h1><br>Press start to select data folder</html>");
 		introText.setHorizontalAlignment(JLabel.CENTER);
 		introText.setFont(new Font("Arial", Font.PLAIN, 16));