Skip to content

Commit b538c3e

Browse files
committed
Update
1 parent 65ccd9d commit b538c3e

18 files changed

+3430
-8
lines changed

EDAV-assignment2.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -3176,7 +3176,7 @@ <h3>The Fifa Ranking</h3>
31763176
"gridline": "#888"};
31773177
var lineColor = "#59DDAF";
31783178

3179-
var graphTitle = "Proportion of Wins x Ts Distance in Fifa Ranking",
3179+
var graphTitle = "Proportion of Wins x Teams Distance in Fifa Ranking",
31803180
xAxisTitle = "Distance to opponent position in Fifa Ranking",
31813181
yAxisTitle1 = "Share of goals scored per match",
31823182
yAxisTitle2 = "Share of matches won per rank distance";
@@ -3435,7 +3435,7 @@ <h3>The Fifa Ranking</h3>
34353435

34363436
.transition()
34373437
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*10);})
3438-
.duration(1000)
3438+
.duration(500)
34393439
.attr("cx", function(d) { return xScale(d.rankDiff); })
34403440
.attr("cy", function(d) { return yScale(d.avrg); });
34413441

@@ -3503,8 +3503,8 @@ <h3>The Fifa Ranking</h3>
35033503
currentView = "aggregated";
35043504
svg.selectAll("circle")
35053505
.transition()
3506-
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*20);})
3507-
.duration(1000)
3506+
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*10);})
3507+
.duration(500)
35083508
.attr("cy", function(d) { return yScale(d.avrg); })
35093509
.style("stroke", color.circleNeutral)
35103510
.style("fill", color.circleNeutral)
@@ -3523,8 +3523,8 @@ <h3>The Fifa Ranking</h3>
35233523
currentView = "perLocation";
35243524
svg.selectAll("circle")
35253525
.transition()
3526-
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*20);})
3527-
.duration(1000)
3526+
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*10);})
3527+
.duration(500)
35283528
.attr("cy", function(d) { return yScale(d.classAvrg); })
35293529
.style("stroke", function(d, i) {return d.color})
35303530
.style("fill", function(d, i) {return d.color});
@@ -3544,8 +3544,8 @@ <h3>The Fifa Ranking</h3>
35443544
svg.selectAll("circle")
35453545
// .data(dataset)
35463546
.transition()
3547-
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*20);})
3548-
.duration(1000)
3547+
.delay(function(d, i) { return ((d.rankDiff-minRankDiff)*10);})
3548+
.duration(500)
35493549
.attr("cy", function(d) { return yScale(d.goalsAvrg); })
35503550
.style("stroke", function(d, i) {return d.color})
35513551
.style("fill", function(d, i) {return d.color});

EDAV-project.html

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<link href="style/default.css" rel="stylesheet" type="text/css" media="all" />
1111
<link href="style/fonts.css" rel="stylesheet" type="text/css" media="all" />
1212
<link href="style/magnific-popup.css" rel="stylesheet">
13+
<link rel="image_src" href="http://andrewyuan.github.io/img/datavis3.png"/>
14+
<meta name="twitter:image" content="http://andrewyuan.github.io/img/datavis3.png"/>
15+
<meta name="twitter:image:width" content="1920"/>
16+
<meta name="twitter:image:height" content="1080"/>
17+
<meta property="og:image" content="http://andrewyuan.github.io/img/datavis3.png" />
18+
1319
<script src="http://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
1420
<script src="lib/jquery.magnific-popup.min.js?v=0.9.9"></script>
1521
<!--[if IE 6]><link href="default_ie6.css" rel="stylesheet" type="text/css" /><![endif]-->

EDAV-project2.html

+1,139
Large diffs are not rendered by default.

EDAV-project3.html

+1,138
Large diffs are not rendered by default.

EDAV-project4.html

+1,139
Large diffs are not rendered by default.

img/169826909 - Copy.jpg

2.74 MB
Loading

img/169826909.jpg

2.74 MB
Loading

img/2010-fifa-world-cup.jpg

373 KB
Loading

img/FIFA-World-Cup-2014-Banner.jpg

363 KB
Loading

img/background.jpg

1.45 MB
Loading

img/background2.jpg

799 KB
Loading

img/datavis32.png

940 KB
Loading

img/datavis33.png

646 KB
Loading

img/fifa-world-cup-2010.jpg

272 KB
Loading

img/img_9241.jpg

2.27 MB
Loading

img/world-cup-trophy - Copy (2).jpg

85.6 KB
Loading

img/world-cup-trophy - Copy.jpg

166 KB
Loading

img/world-cup-trophy.jpg

85.6 KB
Loading

0 commit comments

Comments
 (0)