From f8ae5b28810979645ccb7cd63fd154863216b31f Mon Sep 17 00:00:00 2001 From: Patrick Fairbank Date: Thu, 20 Aug 2015 23:09:03 -0700 Subject: [PATCH] Added 2015 fields to audience display. --- match_result.go | 5 +++-- static/css/audience_display.css | 17 ++++++----------- static/js/audience_display.js | 30 +++++++++--------------------- templates/audience_display.html | 22 +++++----------------- 4 files changed, 23 insertions(+), 51 deletions(-) diff --git a/match_result.go b/match_result.go index 6d76868..8938429 100644 --- a/match_result.go +++ b/match_result.go @@ -59,6 +59,7 @@ type ScoreSummary struct { ContainerPoints int TotePoints int LitterPoints int + StackPoints int FoulPoints int Score int } @@ -190,6 +191,7 @@ func scoreSummary(score *Score) *ScoreSummary { } } } + summary.StackPoints = summary.ContainerPoints + summary.TotePoints + summary.LitterPoints if score.CoopertitionStack { summary.CoopertitionPoints = 40 } else if score.CoopertitionSet { @@ -197,8 +199,7 @@ func scoreSummary(score *Score) *ScoreSummary { } summary.FoulPoints = 6 * len(score.Fouls) - summary.Score = summary.CoopertitionPoints + summary.AutoPoints + summary.ContainerPoints + - summary.TotePoints + summary.LitterPoints - summary.FoulPoints + summary.Score = summary.AutoPoints + summary.StackPoints + summary.CoopertitionPoints - summary.FoulPoints return summary } diff --git a/static/css/audience_display.css b/static/css/audience_display.css index bd61713..b53b7e0 100644 --- a/static/css/audience_display.css +++ b/static/css/audience_display.css @@ -90,15 +90,10 @@ html { text-align: center; font-family: "FuturaLTBold"; font-size: 55px; - line-height: 80px; + line-height: 104px; color: #fff; opacity: 0; } -.score-fields { - padding: 0px 15px; - margin: -10px 0px; - opacity: 0; -} .assist { float: left; width: 22px; @@ -120,11 +115,11 @@ html { #logo { position: relative; top: 35px; - height: 70px; + height: 65px; } #matchTime { position: relative; - top: 7px; + top: 18px; height: 60px; color: #000; font-family: "FuturaLTBold"; @@ -195,8 +190,8 @@ html { } #blindsLogo { position: relative; - top: 70px; - height: 150px; + top: 75px; + height: 130px; } #finalScore { position: fixed; @@ -262,7 +257,7 @@ html { background-color: #fff; color: #000; font-family: "FuturaLT"; - font-size: 30px; + font-size: 24px; } #redFinalBreakdown { clear: left; diff --git a/static/js/audience_display.js b/static/js/audience_display.js index b41cd43..21e505b 100644 --- a/static/js/audience_display.js +++ b/static/js/audience_display.js @@ -53,17 +53,7 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { $("#redScoreNumber").text(data.RedScore); - $("#redAssist1").attr("data-on", data.RedCycle.Assists >= 1); - $("#redAssist2").attr("data-on", data.RedCycle.Assists >= 2); - $("#redAssist3").attr("data-on", data.RedCycle.Assists >= 3); - $("#redTruss").attr("data-on", data.RedCycle.Truss); - $("#redCatch").attr("data-on", data.RedCycle.Catch); $("#blueScoreNumber").text(data.BlueScore); - $("#blueAssist1").attr("data-on", data.BlueCycle.Assists >= 1); - $("#blueAssist2").attr("data-on", data.BlueCycle.Assists >= 2); - $("#blueAssist3").attr("data-on", data.BlueCycle.Assists >= 3); - $("#blueTruss").attr("data-on", data.BlueCycle.Truss); - $("#blueCatch").attr("data-on", data.BlueCycle.Catch); }; // Handles a websocket message to populate the final score data. @@ -73,14 +63,16 @@ var handleSetFinalScore = function(data) { $("#redFinalTeam2").text(data.Match.Red2); $("#redFinalTeam3").text(data.Match.Red3); $("#redFinalAuto").text(data.RedScore.AutoPoints); - $("#redFinalTeleop").text(data.RedScore.TeleopPoints); + $("#redFinalStack").text(data.RedScore.StackPoints); + $("#redFinalCoopertition").text(data.RedScore.CoopertitionPoints); $("#redFinalFoul").text(data.RedScore.FoulPoints); $("#blueFinalScore").text(data.BlueScore.Score); $("#blueFinalTeam1").text(data.Match.Blue1); $("#blueFinalTeam2").text(data.Match.Blue2); $("#blueFinalTeam3").text(data.Match.Blue3); $("#blueFinalAuto").text(data.BlueScore.AutoPoints); - $("#blueFinalTeleop").text(data.BlueScore.TeleopPoints); + $("#blueFinalStack").text(data.BlueScore.StackPoints); + $("#blueFinalCoopertition").text(data.BlueScore.CoopertitionPoints); $("#blueFinalFoul").text(data.BlueScore.FoulPoints); $("#finalMatchName").text(data.MatchName + " " + data.Match.DisplayName); }; @@ -134,10 +126,9 @@ var transitionBlankToIntro = function(callback) { }; var transitionIntroToInMatch = function(callback) { - $("#logo").transition({queue: false, top: "15px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "20px"}, 500, "ease"); $(".score").transition({queue: false, width: "230px"}, 500, "ease", function() { $(".score-number").transition({queue: false, opacity: 1}, 750, "ease"); - $(".score-fields").transition({queue: false, opacity: 1}, 750, "ease"); $("#matchTime").transition({queue: false, opacity: 1}, 750, "ease", callback); }); }; @@ -155,11 +146,10 @@ var transitionIntroToBlank = function(callback) { var transitionBlankToInMatch = function(callback) { $("#centering").transition({queue: false, bottom: "0px"}, 500, "ease", function() { $(".teams").transition({queue: false, width: "75px"}, 100, "linear", function() { - $("#logo").transition({queue: false, top: "15px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "20px"}, 500, "ease"); $(".score").transition({queue: false, width: "230px"}, 500, "ease", function() { $("#eventMatchInfo").show(); $(".score-number").transition({queue: false, opacity: 1}, 750, "ease"); - $(".score-fields").transition({queue: false, opacity: 1}, 750, "ease"); $("#matchTime").transition({queue: false, opacity: 1}, 750, "ease", callback); var height = -$("#eventMatchInfo").height(); $("#eventMatchInfo").transition({queue: false, bottom: height + "px"}, 500, "ease", callback); @@ -170,9 +160,8 @@ var transitionBlankToInMatch = function(callback) { var transitionInMatchToIntro = function(callback) { $(".score-number").transition({queue: false, opacity: 0}, 300, "linear"); - $(".score-fields").transition({queue: false, opacity: 0}, 300, "linear"); $("#matchTime").transition({queue: false, opacity: 0}, 300, "linear", function() { - $("#logo").transition({queue: false, top: "30px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); $(".score").transition({queue: false, width: "120px"}, 500, "ease"); $(".teams").transition({queue: false, width: "75px"}, 500, "ease", callback); }); @@ -181,10 +170,9 @@ var transitionInMatchToIntro = function(callback) { var transitionInMatchToBlank = function(callback) { $("#eventMatchInfo").transition({queue: false, bottom: "0px"}, 500, "ease"); $("#matchTime").transition({queue: false, opacity: 0}, 300, "linear"); - $(".score-number").transition({queue: false, opacity: 0}, 300, "linear"); - $(".score-fields").transition({queue: false, opacity: 0}, 300, "linear", function() { + $(".score-number").transition({queue: false, opacity: 0}, 300, "linear", function() { $("#eventMatchInfo").hide(); - $("#logo").transition({queue: false, top: "30px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); $(".score").transition({queue: false, width: "0px"}, 500, "ease"); $(".teams").transition({queue: false, width: "40px"}, 500, "ease", function() { $("#centering").transition({queue: false, bottom: "-340px"}, 1000, "ease", callback); diff --git a/templates/audience_display.html b/templates/audience_display.html index 12ea776..2345e09 100644 --- a/templates/audience_display.html +++ b/templates/audience_display.html @@ -25,23 +25,9 @@
 
-
-
-
-
-
T
-
C
-
 
-
-
T
-
C
-
-
-
-
@@ -86,17 +72,19 @@

-
+
+
- Autonomous
Teleoperated
Foul + Autonomous
Stack
Coopertition
Foul

-
+
+