From 3819da73b0bbf8604a0ef33cfa7dcf4eac2e8d33 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 30 Mar 2019 14:25:48 +0100 Subject: piecharts! --- client/chart/pie.charts.js | 3 ++- site/content/pages/datasets/brainwash/index.md | 2 ++ site/content/pages/datasets/duke_mtmc/index.md | 5 ++++- site/content/pages/datasets/hrt_transgender/index.md | 2 ++ site/content/pages/datasets/lfw/index.md | 2 ++ site/content/pages/datasets/uccs/index.md | 4 ++++ site/content/pages/datasets/viper/index.md | 2 ++ site/includes/piechart.html | 10 ++++++++++ 8 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 site/includes/piechart.html diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js index 47f7756c..af790be7 100644 --- a/client/chart/pie.charts.js +++ b/client/chart/pie.charts.js @@ -18,6 +18,7 @@ class PieCharts extends Component { const { payload } = this.props const { paper, citations } = payload.data if (!citations.length) return null + const countries = {} const institutionTypes = { ...initialInstitutionLookup } citations.forEach(citation => { @@ -55,7 +56,7 @@ class PieCharts extends Component { otherCountryCount, ]) } - console.log(countryTuples, otherCountryCount, countryRows) + // console.log(countryTuples, otherCountryCount, countryRows) const institutionRows = toTuples(institutionTypes) .map(a => [institutionOrder[a[0]], a]) diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md index 0070fc55..0bf67455 100644 --- a/site/content/pages/datasets/brainwash/index.md +++ b/site/content/pages/datasets/brainwash/index.md @@ -44,6 +44,8 @@ Since it's publication by Stanford in 2015, the Brainwash dataset has appeared i {% include 'chart.html' %} +{% include 'piechart.html' %} + {% include 'map.html' %} Add more analysis here diff --git a/site/content/pages/datasets/duke_mtmc/index.md b/site/content/pages/datasets/duke_mtmc/index.md index 2989ed7c..94eab823 100644 --- a/site/content/pages/datasets/duke_mtmc/index.md +++ b/site/content/pages/datasets/duke_mtmc/index.md @@ -29,11 +29,14 @@ authors: Adam Harvey {% include 'map.html' %} +{% include 'chart.html' %} + +{% include 'piechart.html' %} + {% include 'supplementary_header.html' %} {% include 'citations.html' %} - ---- ## Research Notes diff --git a/site/content/pages/datasets/hrt_transgender/index.md b/site/content/pages/datasets/hrt_transgender/index.md index 0a4ec90d..2d7fdcca 100644 --- a/site/content/pages/datasets/hrt_transgender/index.md +++ b/site/content/pages/datasets/hrt_transgender/index.md @@ -24,6 +24,8 @@ authors: Adam Harvey {% include 'chart.html' %} +{% include 'piechart.html' %} + {% include 'map.html' %} {% include 'supplementary_header.html' %} diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md index b83bd6de..a8c8e2eb 100644 --- a/site/content/pages/datasets/lfw/index.md +++ b/site/content/pages/datasets/lfw/index.md @@ -52,6 +52,8 @@ The *Names and Faces* dataset was the first face recognition dataset created ent {% include 'chart.html' %} +{% include 'piechart.html' %} + {% include 'supplementary_header.html' %} {% include 'citations.html' %} diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md index fe928308..1048d9fd 100644 --- a/site/content/pages/datasets/uccs/index.md +++ b/site/content/pages/datasets/uccs/index.md @@ -27,6 +27,10 @@ authors: Adam Harvey {% include 'map.html' %} +{% include 'chart.html' %} + +{% include 'piechart.html' %} + {% include 'supplementary_header.html' %} {% include 'citations.html' %} diff --git a/site/content/pages/datasets/viper/index.md b/site/content/pages/datasets/viper/index.md index 75f4aae3..6a21efda 100644 --- a/site/content/pages/datasets/viper/index.md +++ b/site/content/pages/datasets/viper/index.md @@ -32,6 +32,8 @@ VIPeR is amongst the most widely used publicly available person re-identificatio {% include 'chart.html' %} +{% include 'piechart.html' %} + {% include 'map.html' %} {% include 'supplementary_header.html' %} diff --git a/site/includes/piechart.html b/site/includes/piechart.html new file mode 100644 index 00000000..e739bb28 --- /dev/null +++ b/site/includes/piechart.html @@ -0,0 +1,10 @@ +
+

+ These pie charts show overall totals based on country and institution type. +

+ +
+ +
+
+
-- cgit v1.2.3-70-g09d2