Update

Team4388 · Mar 2, 2024 · 8731708 · 8731708
1 parent 038a415
commit 8731708
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 35 deletions.
diff --git a/jsonpack.py b/jsonpack.py
diff --git a/main.py b/main.py
diff --git a/oprs.py b/oprs.py
@@ -235,39 +235,46 @@ def getProcessedData(eventName):
         alliance = file.split('-')[2]
 
         matchdata = matchlist[int(match.split('qm')[1])-1]
-        scoutdata = jsonpack.unpack(openFile(dataroot+eventName+'/'+file))
-        key = file.split('-')[1]
-
-        makeObject(tmpMatchData, key)
-        makeArray(tmpMatchData[key], 'blue')
-        makeArray(tmpMatchData[key], 'red')
-        makeArray(tmpMatchData[key], 'bluewins')
-        makeArray(tmpMatchData[key], 'blueScores')
-        makeArray(tmpMatchData[key], 'redScores')
-
-        tmpMatchData[key]['blue'] = matchdata['blue']
-        tmpMatchData[key]['red'] = matchdata['red']
-
-        tmpMatchData[key]['blueScores'].append(scoutdata['blueScore'])
-        tmpMatchData[key]['redScores'].append(scoutdata['redScore'])
-
-        if alliance == 'blue':
-            tmpMatchData[key]['bluewins'].append(scoutdata['win'])
-        else:
-            tmpMatchData[key]['bluewins'].append(not scoutdata['win'])
-
-        team = scoutdata['team']
-        makeObject(teamResults, team)
-        makeNumber(teamResults[team], 'autoPerformance')
-        teamResults[team]['autoPerformance'] += int(scoutdata['autoPerformance'])
-        makeNumber(teamResults[team], 'teleopPerformance')
-        teamResults[team]['teleopPerformance'] += int(scoutdata['teleopPerformance'])
-        makeNumber(teamResults[team], 'overallPerformance')
-        teamResults[team]['overallPerformance'] += int(scoutdata['overallPerformance'])
-        makeNumber(teamResults[team], 'endState')
-        teamResults[team]['endState'] += int(scoutdata['endState'])
-        makeNumber(teamResults[team], 'scoreArea')
-        teamResults[team]['scoreArea'] += int(scoutdata['scoreArea'])
+        #print(dataroot+eventName+'/'+file)
+        try:
+            scoutdata = jsonpack.unpack(openFile(dataroot+eventName+'/'+file))
+
+            key = file.split('-')[1]
+
+            makeObject(tmpMatchData, key)
+            makeArray(tmpMatchData[key], 'blue')
+            makeArray(tmpMatchData[key], 'red')
+            makeArray(tmpMatchData[key], 'bluewins')
+            makeArray(tmpMatchData[key], 'blueScores')
+            makeArray(tmpMatchData[key], 'redScores')
+
+            tmpMatchData[key]['blue'] = matchdata['blue']
+            tmpMatchData[key]['red'] = matchdata['red']
+
+            tmpMatchData[key]['blueScores'].append(scoutdata['blueScore'])
+            tmpMatchData[key]['redScores'].append(scoutdata['redScore'])
+
+            if alliance == 'blue':
+                tmpMatchData[key]['bluewins'].append(scoutdata['win'])
+            else:
+                tmpMatchData[key]['bluewins'].append(not scoutdata['win'])
+
+            team = scoutdata['team']
+            makeObject(teamResults, team)
+            makeNumber(teamResults[team], 'autoPerformance')
+            teamResults[team]['autoPerformance'] += int(scoutdata['autoPerformance'])
+            makeNumber(teamResults[team], 'teleopPerformance')
+            teamResults[team]['teleopPerformance'] += int(scoutdata['teleopPerformance'])
+            makeNumber(teamResults[team], 'overallPerformance')
+            teamResults[team]['overallPerformance'] += int(scoutdata['overallPerformance'])
+            makeNumber(teamResults[team], 'endState')
+            teamResults[team]['endState'] += int(scoutdata['endState'])
+            makeNumber(teamResults[team], 'scoreArea')
+            teamResults[team]['scoreArea'] += int(scoutdata['scoreArea'])
+
+        except:
+            continue
+
 
     #print(tmpMatchData)
     oprData = []
@@ -363,4 +370,4 @@ def getProcessedData(eventName):
             teamOPR['scoreArea'] = 0
 
 
-    return oprData, pinvInaccuracy
+    return oprData, pinvInaccuracy
diff --git a/tools/fakescout.py b/tools/fakescout.py
diff --git a/tools/practice.py b/tools/practice.py
diff --git a/tools/tbadownloader.py b/tools/tbadownloader.py
diff --git a/web/leaderboard.html b/web/leaderboard.html
diff --git a/web/matchscout.html b/web/matchscout.html
@@ -112,8 +112,9 @@ <h3 id="teamPosition">Position: </h3>
     <div style="display: inline;">
       <p>Prompts:</p>
       <p>How fast was the robot able to score?</p>
+      <p>Was the robot easily defended?</p>
+      <p>How did the human player do?</p>
       <p>Did anything unusual happen?</p>
-      <p>Did the robot blow up?</p>
     </div>
   </div>
 </div>

diff --git a/web/predictor.html b/web/predictor.html
diff --git a/web/selector.html b/web/selector.html
diff --git a/web/src/pico.min.css b/web/src/pico.min.css
diff --git a/web/src/socket.io.js b/web/src/socket.io.js
diff --git a/web/team.html b/web/team.html