From 164b92454f2814e73dee9f673c1de07b715bc424 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 30 Mar 2019 12:17:56 +0100 Subject: pie chart test --- client/applet.js | 6 +- client/chart/chart.container.js | 199 ---------------------------------- client/chart/constants.js | 33 ++++++ client/chart/countriesByYear.chart.js | 167 ++++++++++++++++++++++++++++ client/chart/index.js | 6 +- client/chart/pie.charts.js | 167 ++++++++++++++++++++++++++++ site/content/pages/test/index.md | 1 + site/content/pages/test/pie_chart.md | 19 ++++ site/public/test/index.html | 1 + site/public/test/pie_chart/index.html | 51 +++++++++ 10 files changed, 447 insertions(+), 203 deletions(-) delete mode 100644 client/chart/chart.container.js create mode 100644 client/chart/constants.js create mode 100644 client/chart/countriesByYear.chart.js create mode 100644 client/chart/pie.charts.js create mode 100644 site/content/pages/test/pie_chart.md create mode 100644 site/public/test/pie_chart/index.html diff --git a/client/applet.js b/client/applet.js index cd73925c..21e1e4fa 100644 --- a/client/applet.js +++ b/client/applet.js @@ -4,7 +4,7 @@ import { Container as FaceSearchContainer } from './faceSearch' import { Container as FaceAnalysisContainer } from './faceAnalysis' import { Container as NameSearchContainer } from './nameSearch' import { Container as DatasetListContainer } from './datasetList' -import { Container as ChartContainer } from './chart' +import { CountriesByYear, PieCharts } from './chart' export default class Applet extends Component { render() { @@ -19,7 +19,9 @@ export default class Applet extends Component { case 'dataset_list': return case 'chart': - return + return + case 'piechart': + return default: return 
{'Megapixels'}
} diff --git a/client/chart/chart.container.js b/client/chart/chart.container.js deleted file mode 100644 index aa80100e..00000000 --- a/client/chart/chart.container.js +++ /dev/null @@ -1,199 +0,0 @@ -import React, { Component } from 'react' -import { bindActionCreators } from 'redux' -import { connect } from 'react-redux' -import { toArray } from '../util' -import C3Chart from 'react-c3js' -import 'c3/c3.css' -import './chart.css' - -const rainbow = [ - '#9e0142', - '#d53e4f', - '#f46d43', - '#fdae61', - '#fee08b', - '#ffffbf', - '#e6f598', - '#abdda4', - '#66c2a5', - '#3288bd', - '#5e4fa2', - // '#888888', -] - -const colorblindSafeRainbow = [ - '#a50026', - '#d73027', - '#f46d43', - '#fdae61', - '#fee090', - '#ffffbf', - '#e0f3f8', - '#abd9e9', - '#74add1', - '#4575b4', - '#313695', - // '#888888', -] - -const topCountryCount = 10 - -const otherCountriesLabel = 'Other Countries' - -class ChartContainer extends Component { - render() { - const { payload } = this.props - const { paper, citations } = payload.data - if (!citations.length) return null - const years = {} - const countries = {} - citations.forEach(citation => { - let { year, addresses } = citation - if (!year || !parseInt(year)) return - year = parseInt(year) - years[year] = years[year] || {} - addresses.forEach(address => { - const { country } = address - if (!country) return - if (!(country in countries)) { - countries[country] = 1 - } else { - countries[country] += 1 - } - if (country in years[year]) { - years[year][country] += 1 - } else { - years[year][country] = 1 - countries[country] = true - } - }) - }) - let yearList = Object.keys(years).map(year => parseInt(year)).sort() - for (let i = yearList[0]; i < yearList[-1]; i++) { - if (!(i in years)) { - years[i] = {} - } - } - yearList = Object.keys(years).map(year => parseInt(year)).sort() - - Object.keys(countries).forEach(country => { - yearList.forEach(year => { - if (!(country in years[year])) years[year][country] = 0 - }) - }) - - // figure out the top N countries in the dataset - const countriesByCount = Object.keys(countries).sort((a,b) => countries[b] - countries[a]) - // console.log(countriesByCount) - let topCountries = countriesByCount.slice(0, topCountryCount) - let otherCountries = countriesByCount.slice(topCountryCount) - - let citationCountsByYear = - [ ['x'].concat(yearList.map(year => String(year))) ] - .concat( - topCountries - .map(country => - [country] - .concat( - yearList - .map(year => years[year][country]) - ) - ) - ) - - citationCountsByYear.push( - [otherCountriesLabel].concat( - yearList.map(year => otherCountries.reduce((a,b) => (a + years[year][b]), 0)) - ) - ) - - let maxCitationsInAYear = 0 - let currentSum = 0 - // for each year... - for (let j = 1; j < citationCountsByYear[0].length; j++) { - // for each country - currentSum = 0 - for (let i = 1; i < citationCountsByYear.length; i++) { - currentSum += citationCountsByYear[i][j] - } - maxCitationsInAYear = Math.max(currentSum, maxCitationsInAYear) - } - - let ticks = [] - for (let i = 0; i < maxCitationsInAYear; i += 50) { - ticks.push(i) - } - if (ticks[ticks.length - 1] < maxCitationsInAYear) { - ticks.push('') - } - - const colorPattern = rainbow - - return ( -
- [country, countriesByYearLookup[country]]).sort((a,b) => b[1] - a[1]) - let topCountriesForThisYear = countriesByYear.slice(0, topCountryCount) - let bottomTotal = countriesByYear.slice(topCountryCount).reduce((a,b) => (a + b[1]), 0) - // console.log(topCountriesForThisYear) - topCountriesForThisYear.push([otherCountriesLabel, bottomTotal]) - const tableRows = topCountriesForThisYear.filter(pair => !!pair[1]).map(([country, total]) => { - let colorIndex = topCountries.indexOf(country) - if (colorIndex < 0) colorIndex = colorPattern.length - 1 - const color = colorPattern[ colorIndex ] - return [ - "", - "", - "", - country, - "", - "", - total, - "", - "", - ].join('') - }) - return [ - "", - ...tableRows, - "
", - ].join('') - } - }} - /> -
- ) - } -} - -export default ChartContainer diff --git a/client/chart/constants.js b/client/chart/constants.js new file mode 100644 index 00000000..295b9232 --- /dev/null +++ b/client/chart/constants.js @@ -0,0 +1,33 @@ +export const rainbow = [ + '#9e0142', + '#d53e4f', + '#f46d43', + '#fdae61', + '#fee08b', + '#ffffbf', + '#e6f598', + '#abdda4', + '#66c2a5', + '#3288bd', + '#5e4fa2', + // '#888888', +] + +export const colorblindSafeRainbow = [ + '#a50026', + '#d73027', + '#f46d43', + '#fdae61', + '#fee090', + '#ffffbf', + '#e0f3f8', + '#abd9e9', + '#74add1', + '#4575b4', + '#313695', + // '#888888', +] + +export const topCountryCount = 10 + +export const otherCountriesLabel = 'Other Countries' diff --git a/client/chart/countriesByYear.chart.js b/client/chart/countriesByYear.chart.js new file mode 100644 index 00000000..c846fd0f --- /dev/null +++ b/client/chart/countriesByYear.chart.js @@ -0,0 +1,167 @@ +import React, { Component } from 'react' +import { bindActionCreators } from 'redux' +import { connect } from 'react-redux' +import { toArray } from '../util' +import C3Chart from 'react-c3js' +import 'c3/c3.css' +import './chart.css' + +import { rainbow, colorblindSafeRainbow, topCountryCount, otherCountriesLabel } from './constants' + +class CountriesByYearChart extends Component { + render() { + const { payload } = this.props + const { paper, citations } = payload.data + if (!citations.length) return null + const years = {} + const countries = {} + citations.forEach(citation => { + let { year, addresses } = citation + if (!year || !parseInt(year)) return + year = parseInt(year) + years[year] = years[year] || {} + addresses.forEach(address => { + const { country } = address + if (!country) return + if (!(country in countries)) { + countries[country] = 1 + } else { + countries[country] += 1 + } + if (country in years[year]) { + years[year][country] += 1 + } else { + years[year][country] = 1 + countries[country] = true + } + }) + }) + let yearList = Object.keys(years).map(year => parseInt(year)).sort() + for (let i = yearList[0]; i < yearList[-1]; i++) { + if (!(i in years)) { + years[i] = {} + } + } + yearList = Object.keys(years).map(year => parseInt(year)).sort() + + Object.keys(countries).forEach(country => { + yearList.forEach(year => { + if (!(country in years[year])) years[year][country] = 0 + }) + }) + + // figure out the top N countries in the dataset + const countriesByCount = Object.keys(countries).sort((a,b) => countries[b] - countries[a]) + // console.log(countriesByCount) + let topCountries = countriesByCount.slice(0, topCountryCount) + let otherCountries = countriesByCount.slice(topCountryCount) + + let citationCountsByYear = + [ ['x'].concat(yearList.map(year => String(year))) ] + .concat( + topCountries + .map(country => + [country] + .concat( + yearList + .map(year => years[year][country]) + ) + ) + ) + + citationCountsByYear.push( + [otherCountriesLabel].concat( + yearList.map(year => otherCountries.reduce((a,b) => (a + years[year][b]), 0)) + ) + ) + + let maxCitationsInAYear = 0 + let currentSum = 0 + // for each year... + for (let j = 1; j < citationCountsByYear[0].length; j++) { + // for each country + currentSum = 0 + for (let i = 1; i < citationCountsByYear.length; i++) { + currentSum += citationCountsByYear[i][j] + } + maxCitationsInAYear = Math.max(currentSum, maxCitationsInAYear) + } + + let ticks = [] + for (let i = 0; i < maxCitationsInAYear; i += 50) { + ticks.push(i) + } + if (ticks[ticks.length - 1] < maxCitationsInAYear) { + ticks.push('') + } + + const colorPattern = rainbow + + return ( +
+ [country, countriesByYearLookup[country]]).sort((a,b) => b[1] - a[1]) + let topCountriesForThisYear = countriesByYear.slice(0, topCountryCount) + let bottomTotal = countriesByYear.slice(topCountryCount).reduce((a,b) => (a + b[1]), 0) + // console.log(topCountriesForThisYear) + topCountriesForThisYear.push([otherCountriesLabel, bottomTotal]) + const tableRows = topCountriesForThisYear.filter(pair => !!pair[1]).map(([country, total]) => { + let colorIndex = topCountries.indexOf(country) + if (colorIndex < 0) colorIndex = colorPattern.length - 1 + const color = colorPattern[ colorIndex ] + return [ + "", + "", + "", + country, + "", + "", + total, + "", + "", + ].join('') + }) + return [ + "", + ...tableRows, + "
", + ].join('') + } + }} + /> +
+ ) + } +} + +export default CountriesByYearChart diff --git a/client/chart/index.js b/client/chart/index.js index e9d3322d..27650020 100644 --- a/client/chart/index.js +++ b/client/chart/index.js @@ -1,5 +1,7 @@ -import Container from './chart.container' +import CountriesByYear from './countriesByYear.chart' +import PieCharts from './pie.charts' export { - Container, + CountriesByYear, + PieCharts, } diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js new file mode 100644 index 00000000..998d6758 --- /dev/null +++ b/client/chart/pie.charts.js @@ -0,0 +1,167 @@ +import React, { Component } from 'react' +import { bindActionCreators } from 'redux' +import { connect } from 'react-redux' +import { toArray } from '../util' +import C3Chart from 'react-c3js' +import 'c3/c3.css' +import './chart.css' + +import { rainbow, colorblindSafeRainbow, topCountryCount, otherCountriesLabel } from './constants' + +class PieCharts extends Component { + render() { + const { payload } = this.props + const { paper, citations } = payload.data + if (!citations.length) return null + const years = {} + const countries = {} + citations.forEach(citation => { + let { year, addresses } = citation + if (!year || !parseInt(year)) return + year = parseInt(year) + years[year] = years[year] || {} + addresses.forEach(address => { + const { country } = address + if (!country) return + if (!(country in countries)) { + countries[country] = 1 + } else { + countries[country] += 1 + } + if (country in years[year]) { + years[year][country] += 1 + } else { + years[year][country] = 1 + countries[country] = true + } + }) + }) + let yearList = Object.keys(years).map(year => parseInt(year)).sort() + for (let i = yearList[0]; i < yearList[-1]; i++) { + if (!(i in years)) { + years[i] = {} + } + } + yearList = Object.keys(years).map(year => parseInt(year)).sort() + + Object.keys(countries).forEach(country => { + yearList.forEach(year => { + if (!(country in years[year])) years[year][country] = 0 + }) + }) + + // figure out the top N countries in the dataset + const countriesByCount = Object.keys(countries).sort((a,b) => countries[b] - countries[a]) + // console.log(countriesByCount) + let topCountries = countriesByCount.slice(0, topCountryCount) + let otherCountries = countriesByCount.slice(topCountryCount) + + let citationCountsByYear = + [ ['x'].concat(yearList.map(year => String(year))) ] + .concat( + topCountries + .map(country => + [country] + .concat( + yearList + .map(year => years[year][country]) + ) + ) + ) + + citationCountsByYear.push( + [otherCountriesLabel].concat( + yearList.map(year => otherCountries.reduce((a,b) => (a + years[year][b]), 0)) + ) + ) + + let maxCitationsInAYear = 0 + let currentSum = 0 + // for each year... + for (let j = 1; j < citationCountsByYear[0].length; j++) { + // for each country + currentSum = 0 + for (let i = 1; i < citationCountsByYear.length; i++) { + currentSum += citationCountsByYear[i][j] + } + maxCitationsInAYear = Math.max(currentSum, maxCitationsInAYear) + } + + let ticks = [] + for (let i = 0; i < maxCitationsInAYear; i += 50) { + ticks.push(i) + } + if (ticks[ticks.length - 1] < maxCitationsInAYear) { + ticks.push('') + } + + const colorPattern = rainbow + + return ( +
+ [country, countriesByYearLookup[country]]).sort((a,b) => b[1] - a[1]) + let topCountriesForThisYear = countriesByYear.slice(0, topCountryCount) + let bottomTotal = countriesByYear.slice(topCountryCount).reduce((a,b) => (a + b[1]), 0) + // console.log(topCountriesForThisYear) + topCountriesForThisYear.push([otherCountriesLabel, bottomTotal]) + const tableRows = topCountriesForThisYear.filter(pair => !!pair[1]).map(([country, total]) => { + let colorIndex = topCountries.indexOf(country) + if (colorIndex < 0) colorIndex = colorPattern.length - 1 + const color = colorPattern[ colorIndex ] + return [ + "", + "", + "", + country, + "", + "", + total, + "", + "", + ].join('') + }) + return [ + "", + ...tableRows, + "
", + ].join('') + } + }} + /> +
+ ) + } +} + +export default PieCharts diff --git a/site/content/pages/test/index.md b/site/content/pages/test/index.md index 7d77c3d4..da9db049 100644 --- a/site/content/pages/test/index.md +++ b/site/content/pages/test/index.md @@ -20,4 +20,5 @@ authors: Megapixels - [Face search](/test/face_search/index.html) - [Name search](/test/name_search/index.html) - [Chart](/test/chart/index.html) +- [Pie Chart](/test/pie_chart/index.html) - [Modal image gallery](/test/gallery/index.html) diff --git a/site/content/pages/test/pie_chart.md b/site/content/pages/test/pie_chart.md new file mode 100644 index 00000000..f3d0250a --- /dev/null +++ b/site/content/pages/test/pie_chart.md @@ -0,0 +1,19 @@ +------------ + +status: published +title: Pie Chart +desc: Pie Chart Test +slug: pie-chart-test +published: 2018-12-04 +updated: 2018-12-04 +authors: Megapixels + +------------ + +# Pie Chart + +### [← Back to test index](/test/) + +``` +piechart lfw +``` diff --git a/site/public/test/index.html b/site/public/test/index.html index 8a4ec3fb..0fc839d0 100644 --- a/site/public/test/index.html +++ b/site/public/test/index.html @@ -36,6 +36,7 @@
  • Face search
  • Name search
  • Chart
    • +
  • Pie Chart
  • Modal image gallery
    • diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html new file mode 100644 index 00000000..2ef15a9c --- /dev/null +++ b/site/public/test/pie_chart/index.html @@ -0,0 +1,51 @@ + + + + MegaPixels + + + + + + + + + + + + +
    + + +
    MegaPixels
    +     +
    + Datasets + About +
    +
    +
    + +

    Pie Chart

    +

    ← Back to test index

    +
    + +
    + + + + + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 74741a25434045ba04e87a1049476e7a14c62ae6 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 30 Mar 2019 14:05:18 +0100 Subject: pie chart sizing --- client/chart/constants.js | 31 ++++++ client/chart/countriesByYear.chart.js | 1 - client/chart/pie.charts.js | 177 +++++++++++++++------------------- client/util/index.js | 1 + site/assets/css/applets.css | 21 ++++ site/content/pages/test/chart.md | 2 +- site/content/pages/test/citations.md | 2 +- site/content/pages/test/map.md | 2 +- site/content/pages/test/pie_chart.md | 2 +- site/public/index.html | 1 - site/public/test/chart/index.html | 2 +- site/public/test/citations/index.html | 2 +- site/public/test/map/index.html | 2 +- site/public/test/pie_chart/index.html | 2 +- site/templates/home.html | 1 - 15 files changed, 141 insertions(+), 108 deletions(-) diff --git a/client/chart/constants.js b/client/chart/constants.js index 295b9232..70375ba3 100644 --- a/client/chart/constants.js +++ b/client/chart/constants.js @@ -1,3 +1,5 @@ +/* various nice HSL gradients */ + export const rainbow = [ '#9e0142', '#d53e4f', @@ -28,6 +30,35 @@ export const colorblindSafeRainbow = [ // '#888888', ] +export const institutionColors = [ + '#f2f293', // edu (yellow) + '#3264f6', // company (blue) + '#f30000', // gov/mil (red) +] + +/* stuff for a 'countries' legend */ + export const topCountryCount = 10 export const otherCountriesLabel = 'Other Countries' + +/* institution tuples, labels and templates */ + +export const initialInstitutionLookup = { + 'edu': 0, + 'company': 0, + 'gov': 0, +} + +export const institutionOrder = { + 'edu': 0, + 'company': 1, + 'gov': 2, +} + +export const institutionLabels = { + 'edu': 'Academic', + 'company': 'Commercial', + 'gov': 'Government / Military', + 'mil': 'Government / Military', +} \ No newline at end of file diff --git a/client/chart/countriesByYear.chart.js b/client/chart/countriesByYear.chart.js index c846fd0f..4257748c 100644 --- a/client/chart/countriesByYear.chart.js +++ b/client/chart/countriesByYear.chart.js @@ -32,7 +32,6 @@ class CountriesByYearChart extends Component { years[year][country] += 1 } else { years[year][country] = 1 - countries[country] = true } }) }) diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js index 998d6758..47f7756c 100644 --- a/client/chart/pie.charts.js +++ b/client/chart/pie.charts.js @@ -1,26 +1,27 @@ import React, { Component } from 'react' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' -import { toArray } from '../util' +import { toArray, toTuples } from '../util' import C3Chart from 'react-c3js' import 'c3/c3.css' import './chart.css' -import { rainbow, colorblindSafeRainbow, topCountryCount, otherCountriesLabel } from './constants' +import { + rainbow, colorblindSafeRainbow, + topCountryCount, otherCountriesLabel, + institutionOrder, institutionLabels, institutionColors, + initialInstitutionLookup, +} from './constants' class PieCharts extends Component { render() { const { payload } = this.props const { paper, citations } = payload.data if (!citations.length) return null - const years = {} const countries = {} + const institutionTypes = { ...initialInstitutionLookup } citations.forEach(citation => { - let { year, addresses } = citation - if (!year || !parseInt(year)) return - year = parseInt(year) - years[year] = years[year] || {} - addresses.forEach(address => { + citation.addresses.forEach(address => { const { country } = address if (!country) return if (!(country in countries)) { @@ -28,105 +29,91 @@ class PieCharts extends Component { } else { countries[country] += 1 } - if (country in years[year]) { - years[year][country] += 1 - } else { - years[year][country] = 1 - countries[country] = true + switch (address.type) { + case 'company': + case 'edu': + case 'gov': + institutionTypes[address.type] += 1 + break + case 'mil': + institutionTypes['gov'] += 1 + break + default: + console.log('weird institution type', address) + break } }) }) - let yearList = Object.keys(years).map(year => parseInt(year)).sort() - for (let i = yearList[0]; i < yearList[-1]; i++) { - if (!(i in years)) { - years[i] = {} - } - } - yearList = Object.keys(years).map(year => parseInt(year)).sort() - - Object.keys(countries).forEach(country => { - yearList.forEach(year => { - if (!(country in years[year])) years[year][country] = 0 - }) - }) - - // figure out the top N countries in the dataset - const countriesByCount = Object.keys(countries).sort((a,b) => countries[b] - countries[a]) - // console.log(countriesByCount) - let topCountries = countriesByCount.slice(0, topCountryCount) - let otherCountries = countriesByCount.slice(topCountryCount) - let citationCountsByYear = - [ ['x'].concat(yearList.map(year => String(year))) ] - .concat( - topCountries - .map(country => - [country] - .concat( - yearList - .map(year => years[year][country]) - ) - ) - ) + const countryTuples = toTuples(countries).sort((a,b) => b[1] - a[1]) + let countryRows = countryTuples.slice(0, 9) - citationCountsByYear.push( - [otherCountriesLabel].concat( - yearList.map(year => otherCountries.reduce((a,b) => (a + years[year][b]), 0)) - ) - ) - - let maxCitationsInAYear = 0 - let currentSum = 0 - // for each year... - for (let j = 1; j < citationCountsByYear[0].length; j++) { - // for each country - currentSum = 0 - for (let i = 1; i < citationCountsByYear.length; i++) { - currentSum += citationCountsByYear[i][j] - } - maxCitationsInAYear = Math.max(currentSum, maxCitationsInAYear) + const otherCountryCount = countryTuples.slice(9).reduce((a,b) => (a + b[1]), 0) + if (otherCountryCount > 0) { + countryRows.push([ + otherCountriesLabel, + otherCountryCount, + ]) } + console.log(countryTuples, otherCountryCount, countryRows) - let ticks = [] - for (let i = 0; i < maxCitationsInAYear; i += 50) { - ticks.push(i) - } - if (ticks[ticks.length - 1] < maxCitationsInAYear) { - ticks.push('') - } + const institutionRows = toTuples(institutionTypes) + .map(a => [institutionOrder[a[0]], a]) + .sort((a,b) => a[0] - b[0]) + .map(a => a[1]) + .map(a => [institutionLabels[a[0]], a[1]]) const colorPattern = rainbow return (
    - + value, + } + }} + size={{ + height: 336, + }} + /> +
    +
    + value, + } + }} + size={{ + height: 316, + }} + /> +
    + + ) + } +} + +/* legend={{ position: 'right' }} - color={{ - pattern: colorPattern - }} tooltip={{ contents: function (d, defaultTitleFormat, defaultValueFormat, color) { const countriesByYearLookup = years[yearList[d[0].x]] @@ -158,10 +145,6 @@ class PieCharts extends Component { ].join('') } }} - /> - - ) - } -} +*/ export default PieCharts diff --git a/client/util/index.js b/client/util/index.js index 0792e24e..87d32ebb 100644 --- a/client/util/index.js +++ b/client/util/index.js @@ -9,6 +9,7 @@ export const isFirefox = typeof InstallTrigger !== 'undefined' export const toArray = a => Array.prototype.slice.apply(a) export const choice = a => a[Math.floor(Math.random() * a.length)] +export const toTuples = o => Object.keys(o).map(key => [key, o[key]]) const htmlClassList = document.body.parentNode.classList htmlClassList.add(isDesktop ? 'desktop' : 'mobile') diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css index cbd9f825..02775641 100644 --- a/site/assets/css/applets.css +++ b/site/assets/css/applets.css @@ -206,3 +206,24 @@ .analysisContainer .results div img { max-width: 100%; } + +/* chart */ + +.piechart .chart { + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: flex-start; +} +.piechart .chart > div { + width: 50%; +} +.piechart .chart .c3-chart-arc text { + fill: #fff; +} +.piechart .chart .c3-chart-arc.c3-target-Academic text { + fill: #333; +} +.piechart .c3 path, .piechart .c3 line { + stroke: rgba(64,64,64,0.3); +} \ No newline at end of file diff --git a/site/content/pages/test/chart.md b/site/content/pages/test/chart.md index e29410a7..34c7d30c 100644 --- a/site/content/pages/test/chart.md +++ b/site/content/pages/test/chart.md @@ -15,5 +15,5 @@ authors: Megapixels ### [← Back to test index](/test/) ``` -chart lfw +chart duke_mtmc ``` diff --git a/site/content/pages/test/citations.md b/site/content/pages/test/citations.md index 48ab99b1..f5fc9df2 100644 --- a/site/content/pages/test/citations.md +++ b/site/content/pages/test/citations.md @@ -15,5 +15,5 @@ authors: Megapixels ### [← Back to test index](/test/) ``` -citations lfw +citations duke_mtmc ``` diff --git a/site/content/pages/test/map.md b/site/content/pages/test/map.md index fc5e2847..3490d3df 100644 --- a/site/content/pages/test/map.md +++ b/site/content/pages/test/map.md @@ -15,5 +15,5 @@ authors: Megapixels ### [← Back to test index](/test/) ``` -map lfw +map duke_mtmc ``` diff --git a/site/content/pages/test/pie_chart.md b/site/content/pages/test/pie_chart.md index f3d0250a..ba4a8c3d 100644 --- a/site/content/pages/test/pie_chart.md +++ b/site/content/pages/test/pie_chart.md @@ -15,5 +15,5 @@ authors: Megapixels ### [← Back to test index](/test/) ``` -piechart lfw +piechart duke_mtmc ``` diff --git a/site/public/index.html b/site/public/index.html index 62f78978..11ff7279 100644 --- a/site/public/index.html +++ b/site/public/index.html @@ -19,7 +19,6 @@
    DATASETS - RESEARCH ABOUT
    diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html index fd3d690e..93e12b3c 100644 --- a/site/public/test/chart/index.html +++ b/site/public/test/chart/index.html @@ -28,7 +28,7 @@

    Chart

    ← Back to test index

    -
    +