Skip to content

Commit f9d512b

Browse files
committed
get color_name_summaries.html to show full colors too
1 parent 7f12d7e commit f9d512b

File tree

2 files changed

+44
-19
lines changed

2 files changed

+44
-19
lines changed

vis/color_name_summaries.html

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,21 @@
4747
<h1>Color Name Viewer</h1>
4848
<p>This page lets you see the color names in different languages</p>
4949

50-
50+
<div class="form-check form-check-inline">
51+
<input class="form-check-input" type="radio" name="color_set" id="full_colors" checked>
52+
<label class="form-check-label" for="full_colors">
53+
Full Colors
54+
</label>
55+
</div>
56+
<div class="form-check form-check-inline">
57+
<input class="form-check-input" type="radio" name="color_set" id="hue_colors" >
58+
<label class="form-check-label" for="hue_colors">
59+
Hue Colors
60+
</label>
61+
</div>
62+
5163

52-
<div class="form-check justify-content-center align-items-center flex-nowrap">
64+
<div class="form-check form-check-inline justify-content-center align-items-center flex-nowrap">
5365
<label class="form-label" for="selected_langs" style="display: block; text-align: center;" >Language</label>
5466
<div class="small" style="max-width:500px;margin:auto;">
5567
<select class="form-select small" name ="selected_langs" id="selected_langs" value="selected_langs" style="width:100%">

vis/js/color_name_summaries.js

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,48 @@ const escapeHTML = str => String(str).replace(/[&<>'"]/g,
1010
$(document).on('ready page:load', async () => {
1111

1212
const hueColorNames = await d3.csv("../model/hue_colors_info.csv");
13+
const fullColorNames = await d3.csv("../model/full_colors_info.csv");
1314
console.log(hueColorNames[0]);
1415

15-
const allNamesByLang = Object.groupBy(hueColorNames, ({lang}) => lang)
16-
17-
console.log(Object.keys(allNamesByLang))
18-
19-
let selected_lang_temp = true
20-
for(lang of Object.keys(allNamesByLang)){
21-
$("#selected_langs").append(new Option(lang, lang, true, selected_lang_temp))
22-
selected_lang_temp = false
23-
}
24-
2516
$("#selected_langs").change(e => {
2617
updateTableData()
2718
})
2819

29-
const table = d3.select("#data_view")
20+
$("input:radio[name=color_set]").change(e => {
21+
updateColorSet()
22+
})
23+
24+
let allNamesByLang
25+
const table = d3.select("#data_view")
3026
.html("")
3127
.append("table")
3228

3329

30+
updateColorSet()
31+
32+
function updateColorSet(){
33+
const color_set_val = $('#full_colors').prop("checked") ? "full_colors" : "hue_colors"
34+
let color_set = fullColorNames
35+
if(color_set_val == "hue_colors"){
36+
color_set = hueColorNames
37+
}
38+
39+
allNamesByLang = Object.groupBy(color_set, ({lang}) => lang)
3440

35-
updateTableData();
41+
console.log(Object.keys(allNamesByLang))
42+
43+
$("#selected_langs").empty()
44+
let selected_lang_temp = true
45+
for(lang of Object.keys(allNamesByLang)){
46+
$("#selected_langs").append(new Option(lang, lang, true, selected_lang_temp))
47+
selected_lang_temp = false
48+
}
49+
50+
updateTableData();
51+
}
3652

3753
function updateTableData(){
54+
3855
const selected_lang = $("#selected_langs").val()
3956
if(!selected_lang){
4057
return
@@ -49,16 +66,12 @@ function updateTableData(){
4966
.selectAll("tr")
5067
.data(Object.entries(nameData))
5168
.join("tr")
52-
.attr("test", d => {
53-
d.test
54-
})
5569

5670
rows.selectAll("td")
5771
.data(d => Object.entries(d[1]))
5872
.join("td")
5973
.html(d => {
60-
console.log("html", d[0])
61-
if(d[0] == "avgHueColor"){
74+
if(d[0] == "avgHueColor" || d[0] == "avgColorRGBCode"){
6275
return `
6376
<div
6477
style="height:20px; width: 20px; float:left; margin: 5px;

0 commit comments

Comments
 (0)