Skip to content

Commit a5e1ceb

Browse files
phoeguophoeguo
committedJan 31, 2019
minor changes
1 parent 56e09a5 commit a5e1ceb

File tree

4 files changed

+108
-25
lines changed

4 files changed

+108
-25
lines changed
 

‎dist/g3-utils.js

+28-23
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
(function (global, factory) {
2-
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3')) :
3-
typeof define === 'function' && define.amd ? define(['exports', 'd3'], factory) :
4-
(factory((global.g3utils = global.g3utils || {}),global.d3));
5-
}(this, (function (exports,d3) { 'use strict';
6-
7-
d3 = d3 && d3.hasOwnProperty('default') ? d3['default'] : d3;
2+
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
3+
typeof define === 'function' && define.amd ? define(['exports'], factory) :
4+
(factory((global.g3utils = global.g3utils || {})));
5+
}(this, (function (exports) { 'use strict';
86

97
function getTextWidth(text, font) {
108
var canvas = document.getElementById("canvas") || document.createElement("canvas");
@@ -21,7 +19,8 @@ function getUniqueID(left, right) {
2119

2220
var palettes = {
2321
bottlerocket1: ["#A42820", "#5F5647", "#9B110E", "#3F5151", "#4E2A1E",
24-
"#550307", "#0C1707"],
22+
"#550307", "#0C1707"
23+
],
2524
bottlerocket2: ["#FAD510", "#CB2314", "#273046", "#354823", "#1E1E1E"],
2625
rushmore1: ["#E1BD6D", "#F2300F", "#35274A", "#EABE94", "#0B775E"],
2726
royal1: ["#899DA4", "#C93312", "#FAEFD1", "#DC863B"],
@@ -40,38 +39,49 @@ var palettes = {
4039
google16: ["#3366cc", "#dc3912", "#ff9900", "#109618", "#990099",
4140
"#0099c6", "#dd4477", "#66aa00", "#b82e2e", "#316395",
4241
"#994499", "#22aa99", "#aaaa11", "#6633cc", "#e67300",
43-
"#8b0707", "#651067", "#329262", "#5574a6", "#3b3eac"],
42+
"#8b0707", "#651067", "#329262", "#5574a6", "#3b3eac"
43+
],
4444
google5: ["#008744", "#0057e7", "#d62d20", "#ffa700", "#ffffff"],
4545
material1: ["#263238", "#212121", "#3e2723", "#dd2c00", "#ff6d00",
4646
"#ffab00", "#ffd600", "#aeea00", "#64dd17", "#00c853",
4747
"#00bfa5", "#00b8d4", "#0091ea", "#2962ff", "#304ffe",
48-
"#6200ea", "#aa00ff", "#c51162", "#d50000"],
48+
"#6200ea", "#aa00ff", "#c51162", "#d50000"
49+
],
4950
pie1: ["#a6cee3", "#1f78b4", "#b2df8a", "#33a02c", "#fb9a99"],
5051
pie2: ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00"],
5152
pie3: ["#495769", "#A0C2BB", "#F4A775", "#F4C667", "#F37361"],
5253
pie4: ["#FA7921", "#E55934", "#9BC53D", "#FDE74C", "#5BC0EB"],
5354
pie5: ["#5DA5DA", "#4D4D4D", "#60BD68", "#B2912F", "#B276B2",
54-
"#F15854", "#FAA43A"],
55+
"#F15854", "#FAA43A"
56+
],
5557
pie6: ["#537ea2", "#42a593", "#9f1a1a", "#7c5f95", "#61a070"],
5658
pie7: ["#bddff9", "#1e72bf", "#ead1ab", "#a2dbc5", "#c7ae7d"],
5759
breakfast: ["#b6411a", "#eec3d8", "#4182dd", "#ecf0c8", "#2d6328"],
5860
set1: ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00",
59-
"#ffff33", "#a65628", "#f781bf", "#999999"],
61+
"#ffff33", "#a65628", "#f781bf", "#999999"
62+
],
6063
set2: ["#66c2a5", "#fc8d62", "#8da0cb", "#e78ac3", "#a6d854",
61-
"#ffd92f", "#e5c494", "#b3b3b3"],
64+
"#ffd92f", "#e5c494", "#b3b3b3"
65+
],
6266
set3: ["#8dd3c7", "#ffffb3", "#bebada", "#fb8072", "#80b1d3",
6367
"#fdb462", "#b3de69", "#fccde5", "#d9d9d9", "#bc80bd",
64-
"#ccebc5", "#ffed6f"],
68+
"#ccebc5", "#ffed6f"
69+
],
6570
category10: ["#1f77b4", "#2ca02c", "#d62728", "#ff7f0e", "#9467bd",
66-
"#8c564b", "#e377c2", "#7f7f7f", "#bcbd22", "#17becf"],
71+
"#8c564b", "#e377c2", "#7f7f7f", "#bcbd22", "#17becf"
72+
],
6773
pastel1: ["#fbb4ae", "#b3cde3", "#ccebc5", "#decbe4", "#fed9a6",
68-
"#ffffcc", "#e5d8bd", "#fddaec", "#f2f2f2"],
74+
"#ffffcc", "#e5d8bd", "#fddaec", "#f2f2f2"
75+
],
6976
pastel2: ["#b3e2cd", "#fdcdac", "#cbd5e8", "#f4cae4", "#e6f5c9",
70-
"#fff2ae", "#f1e2cc", "#cccccc"],
77+
"#fff2ae", "#f1e2cc", "#cccccc"
78+
],
7179
accent: ["#7fc97f", "#beaed4", "#fdc086", "#ffff99", "#bf5b17",
72-
"#386cb0", "#f0027f", "#666666"],
80+
"#386cb0", "#f0027f", "#666666"
81+
],
7382
dark2: ["#1b9e77", "#d95f02", "#7570b3", "#e7298a", "#66a61e",
74-
"#e6ab02", "#a6761d", "#666666"],
83+
"#e6ab02", "#a6761d", "#666666"
84+
],
7585
};
7686

7787
function defaultPalette() {
@@ -86,10 +96,6 @@ function listPalettes() {
8696
return Object.keys(palettes);
8797
}
8898

89-
function scaleOrdinal(paletteName){
90-
return d3.scaleOrdinal(getPalette(paletteName));
91-
}
92-
9399
/* FileSaver.js
94100
* A saveAs() FileSaver implementation.
95101
* 1.3.8
@@ -405,7 +411,6 @@ exports.palettes = palettes;
405411
exports.defaultPalette = defaultPalette;
406412
exports.getPalette = getPalette;
407413
exports.listPalettes = listPalettes;
408-
exports.scaleOrdinal = scaleOrdinal;
409414
exports.output = output;
410415

411416
Object.defineProperty(exports, '__esModule', { value: true });

‎dist/g3-utils.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎output.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export { getTextWidth, getUniqueID } from "./src/utils/utils";
2-
export { palettes, defaultPalette, getPalette, listPalettes, scaleOrdinal } from "./src/utils/color";
2+
export { palettes, defaultPalette, getPalette, listPalettes } from "./src/utils/color-utils";
33
export { default as output } from "./src/output/output";

‎src/utils/color-utils.js

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
export var palettes = {
2+
bottlerocket1: ["#A42820", "#5F5647", "#9B110E", "#3F5151", "#4E2A1E",
3+
"#550307", "#0C1707"
4+
],
5+
bottlerocket2: ["#FAD510", "#CB2314", "#273046", "#354823", "#1E1E1E"],
6+
rushmore1: ["#E1BD6D", "#F2300F", "#35274A", "#EABE94", "#0B775E"],
7+
royal1: ["#899DA4", "#C93312", "#FAEFD1", "#DC863B"],
8+
royal2: ["#9A8822", "#F5CDB4", "#F8AFA8", "#FDDDA0", "#74A089"],
9+
zissou1: ["#3B9AB2", "#78B7C5", "#EBCC2A", "#E1AF00", "#F21A00"],
10+
darjeeling1: ["#FF0000", "#00A08A", "#F2AD00", "#F98400", "#5BBCD6"],
11+
darjeeling2: ["#ECCBAE", "#046C9A", "#D69C4E", "#ABDDDE", "#000000"],
12+
chevalier1: ["#446455", "#FDD262", "#D3DDDC", "#C7B19C"],
13+
fantasticfox1: ["#DD8D29", "#E2D200", "#46ACC8", "#E58601", "#B40F20"],
14+
moonrise1: ["#F3DF6C", "#CEAB07", "#D5D5D3", "#24281A"],
15+
moonrise2: ["#798E87", "#C27D38", "#CCC591", "#29211F"],
16+
moonrise3: ["#85D4E3", "#F4B5BD", "#9C964A", "#CDC08C", "#FAD77B"],
17+
cavalcanti1: ["#D8B70A", "#02401B", "#A2A475", "#81A88D", "#972D15"],
18+
grandbudapest1: ["#F1BB7B", "#FD6467", "#5B1A18", "#D67236"],
19+
grandbudapest2: ["#E6A0C4", "#C6CDF7", "#D8A499", "#7294D4"],
20+
google16: ["#3366cc", "#dc3912", "#ff9900", "#109618", "#990099",
21+
"#0099c6", "#dd4477", "#66aa00", "#b82e2e", "#316395",
22+
"#994499", "#22aa99", "#aaaa11", "#6633cc", "#e67300",
23+
"#8b0707", "#651067", "#329262", "#5574a6", "#3b3eac"
24+
],
25+
google5: ["#008744", "#0057e7", "#d62d20", "#ffa700", "#ffffff"],
26+
material1: ["#263238", "#212121", "#3e2723", "#dd2c00", "#ff6d00",
27+
"#ffab00", "#ffd600", "#aeea00", "#64dd17", "#00c853",
28+
"#00bfa5", "#00b8d4", "#0091ea", "#2962ff", "#304ffe",
29+
"#6200ea", "#aa00ff", "#c51162", "#d50000"
30+
],
31+
pie1: ["#a6cee3", "#1f78b4", "#b2df8a", "#33a02c", "#fb9a99"],
32+
pie2: ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00"],
33+
pie3: ["#495769", "#A0C2BB", "#F4A775", "#F4C667", "#F37361"],
34+
pie4: ["#FA7921", "#E55934", "#9BC53D", "#FDE74C", "#5BC0EB"],
35+
pie5: ["#5DA5DA", "#4D4D4D", "#60BD68", "#B2912F", "#B276B2",
36+
"#F15854", "#FAA43A"
37+
],
38+
pie6: ["#537ea2", "#42a593", "#9f1a1a", "#7c5f95", "#61a070"],
39+
pie7: ["#bddff9", "#1e72bf", "#ead1ab", "#a2dbc5", "#c7ae7d"],
40+
breakfast: ["#b6411a", "#eec3d8", "#4182dd", "#ecf0c8", "#2d6328"],
41+
set1: ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00",
42+
"#ffff33", "#a65628", "#f781bf", "#999999"
43+
],
44+
set2: ["#66c2a5", "#fc8d62", "#8da0cb", "#e78ac3", "#a6d854",
45+
"#ffd92f", "#e5c494", "#b3b3b3"
46+
],
47+
set3: ["#8dd3c7", "#ffffb3", "#bebada", "#fb8072", "#80b1d3",
48+
"#fdb462", "#b3de69", "#fccde5", "#d9d9d9", "#bc80bd",
49+
"#ccebc5", "#ffed6f"
50+
],
51+
category10: ["#1f77b4", "#2ca02c", "#d62728", "#ff7f0e", "#9467bd",
52+
"#8c564b", "#e377c2", "#7f7f7f", "#bcbd22", "#17becf"
53+
],
54+
pastel1: ["#fbb4ae", "#b3cde3", "#ccebc5", "#decbe4", "#fed9a6",
55+
"#ffffcc", "#e5d8bd", "#fddaec", "#f2f2f2"
56+
],
57+
pastel2: ["#b3e2cd", "#fdcdac", "#cbd5e8", "#f4cae4", "#e6f5c9",
58+
"#fff2ae", "#f1e2cc", "#cccccc"
59+
],
60+
accent: ["#7fc97f", "#beaed4", "#fdc086", "#ffff99", "#bf5b17",
61+
"#386cb0", "#f0027f", "#666666"
62+
],
63+
dark2: ["#1b9e77", "#d95f02", "#7570b3", "#e7298a", "#66a61e",
64+
"#e6ab02", "#a6761d", "#666666"
65+
],
66+
};
67+
68+
export function defaultPalette() {
69+
return palettes["google16"];
70+
}
71+
72+
export function getPalette(paletteName) {
73+
return (paletteName in palettes) ? palettes[paletteName] : defaultPalette;
74+
}
75+
76+
export function listPalettes() {
77+
return Object.keys(palettes);
78+
}

0 commit comments

Comments
 (0)
Please sign in to comment.