Skip to content

Commit 9f697ba

Browse files
t-bltgt-bltg
committed
update
1 parent c1311f4 commit 9f697ba

File tree

15 files changed

+225
-293
lines changed

15 files changed

+225
-293
lines changed

‎PlotThemes/src/boxed.jl‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
const _boxed = PlotTheme(
2-
Dict(
3-
[
4-
:minorticks => true,
5-
:grid => false,
6-
:frame => :box,
7-
:guidefontvalign => :top,
8-
:guidefonthalign => :right,
9-
:foreground_color_legend => nothing,
10-
:legendfontsize => 9,
11-
:legend => :topright,
12-
:xlim => (:auto, :auto),
13-
:ylim => (:auto, :auto),
14-
:label => "",
15-
:palette => expand_palette(
16-
colorant"white",
17-
[RGB(0, 0, 0); wong_palette];
18-
lchoices = [57],
19-
cchoices = [100],
20-
),
21-
]
1+
const _boxed = [
2+
:minorticks => true,
3+
:grid => false,
4+
:frame => :box,
5+
:guidefontvalign => :top,
6+
:guidefonthalign => :right,
7+
:foreground_color_legend => nothing,
8+
:legendfontsize => 9,
9+
:legend => :topright,
10+
:xlim => (:auto, :auto),
11+
:ylim => (:auto, :auto),
12+
:label => "",
13+
:palette => expand_palette(
14+
colorant"white",
15+
[RGB(0, 0, 0); wong_palette];
16+
lchoices = [57],
17+
cchoices = [100],
2218
),
23-
)
19+
] |> Dict |> PlotTheme

‎PlotThemes/src/dao.jl‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,22 @@ const dao_palette = [
77
colorant"#9467bd",
88
]
99

10-
const _dao = PlotTheme(
11-
Dict(
12-
[
13-
:background => :white,
14-
:framestyle => :box,
15-
:grid => true,
16-
:gridalpha => 0.4,
17-
:linewidth => 1.4,
18-
:markerstrokewidth => 0,
19-
:fontfamily => "Computer Modern",
20-
:colorgradient => :magma,
21-
:guidefontsize => 12,
22-
:titlefontsize => 12,
23-
:tickfontsize => 8,
24-
:palette => dao_palette,
25-
:minorgrid => true,
26-
:minorticks => 5,
27-
:gridlinewidth => 0.7,
28-
:minorgridalpha => 0.06,
29-
:legend => :outertopright,
30-
]
31-
),
32-
)
10+
const _dao = [
11+
:background => :white,
12+
:framestyle => :box,
13+
:grid => true,
14+
:gridalpha => 0.4,
15+
:linewidth => 1.4,
16+
:markerstrokewidth => 0,
17+
:fontfamily => "Computer Modern",
18+
:colorgradient => :magma,
19+
:guidefontsize => 12,
20+
:titlefontsize => 12,
21+
:tickfontsize => 8,
22+
:palette => dao_palette,
23+
:minorgrid => true,
24+
:minorticks => 5,
25+
:gridlinewidth => 0.7,
26+
:minorgridalpha => 0.06,
27+
:legend => :outertopright,
28+
] |> Dict |> PlotTheme

‎PlotThemes/src/dark.jl‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@ const dark_palette = [
77
]
88
const dark_bg = colorant"#363D46"
99

10-
const _dark = PlotTheme(
11-
Dict(
12-
[
13-
:bg => dark_bg,
14-
:bginside => colorant"#30343B",
15-
:fg => colorant"#ADB2B7",
16-
:fgtext => colorant"#FFFFFF",
17-
:fgguide => colorant"#FFFFFF",
18-
:fglegend => colorant"#FFFFFF",
19-
:legendfontcolor => colorant"#FFFFFF",
20-
:legendtitlefontcolor => colorant"#FFFFFF",
21-
:titlefontcolor => colorant"#FFFFFF",
22-
:palette =>
23-
expand_palette(dark_bg, dark_palette; lchoices = [57], cchoices = [100]),
24-
:colorgradient => :fire,
25-
]
26-
),
27-
)
10+
const _dark = [
11+
:bg => dark_bg,
12+
:bginside => colorant"#30343B",
13+
:fg => colorant"#ADB2B7",
14+
:fgtext => colorant"#FFFFFF",
15+
:fgguide => colorant"#FFFFFF",
16+
:fglegend => colorant"#FFFFFF",
17+
:legendfontcolor => colorant"#FFFFFF",
18+
:legendtitlefontcolor => colorant"#FFFFFF",
19+
:titlefontcolor => colorant"#FFFFFF",
20+
:palette =>
21+
expand_palette(dark_bg, dark_palette; lchoices = [57], cchoices = [100]),
22+
:colorgradient => :fire,
23+
] |> Dict |> PlotTheme

‎PlotThemes/src/dracula.jl‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,16 @@ const dracula_palette = [
1313
const dracula_bg = colorant"#282a36"
1414
const dracula_fg = colorant"#f8f8f2"
1515

16-
const _dracula = PlotTheme(
17-
Dict(
18-
[
19-
:bg => dracula_bg,
20-
:bginside => colorant"#30343B",
21-
:fg => dracula_fg,
22-
:fgtext => dracula_fg,
23-
:fgguide => dracula_fg,
24-
:fglegend => dracula_fg,
25-
:legendfontcolor => dracula_fg,
26-
:legendtitlefontcolor => dracula_fg,
27-
:titlefontcolor => dracula_fg,
28-
:palette => expand_palette(dracula_bg, dracula_palette),
29-
:colorgradient => :viridis,
30-
]
31-
),
32-
)
16+
const _dracula = [
17+
:bg => dracula_bg,
18+
:bginside => colorant"#30343B",
19+
:fg => dracula_fg,
20+
:fgtext => dracula_fg,
21+
:fgguide => dracula_fg,
22+
:fglegend => dracula_fg,
23+
:legendfontcolor => dracula_fg,
24+
:legendtitlefontcolor => dracula_fg,
25+
:titlefontcolor => dracula_fg,
26+
:palette => expand_palette(dracula_bg, dracula_palette),
27+
:colorgradient => :viridis,
28+
] |> Dict |> PlotTheme

‎PlotThemes/src/ggplot2.jl‎

Lines changed: 31 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,34 @@ const _ggplot_colors = Dict(
2929
:gray30 => RGB(fill(0.3, 3)...),
3030
)
3131

32-
const _ggplot2 = PlotTheme(
33-
Dict(
34-
[
35-
## Background etc
36-
:bg => :white,
37-
:bginside => _ggplot_colors[:gray92],
38-
:bglegend => _ggplot_colors[:gray92],
39-
:fglegend => :white,
40-
:fgguide => :black,
41-
:widen => true,
42-
## Axes / Ticks
43-
#framestyle => :grid,
44-
#foreground_color_tick => _ggplot_colors[:gray20], # tick color not yet implemented
45-
:foreground_color_axis => _ggplot_colors[:gray20], # tick color
46-
:tick_direction => :out,
47-
:foreground_color_border => :white, # axis color
48-
:foreground_color_text => _ggplot_colors[:gray30], # tick labels
49-
:gridlinewidth => 1,
50-
#tick label size => *0.8,
51-
### Grid
52-
:foreground_color_grid => :white,
53-
:gridalpha => 1,
54-
### Minor Grid
55-
:minorgrid => true,
56-
:minorgridalpha => 1,
57-
:minorgridlinewidth => 0.5, # * 0.5
58-
:foreground_color_minor_grid => :white,
59-
#foreground_color_minortick=>:white, ## not yet implemented
60-
:minorticks => 2,
61-
## Lines and markers
62-
:markerstrokealpha => 0,
63-
:markerstrokewidth => 0,
64-
]
65-
),
66-
#showaxis=> :false
67-
)
32+
const _ggplot2 = [
33+
## Background etc
34+
:bg => :white,
35+
:bginside => _ggplot_colors[:gray92],
36+
:bglegend => _ggplot_colors[:gray92],
37+
:fglegend => :white,
38+
:fgguide => :black,
39+
:widen => true,
40+
## Axes / Ticks
41+
#framestyle => :grid,
42+
#foreground_color_tick => _ggplot_colors[:gray20], # tick color not yet implemented
43+
:foreground_color_axis => _ggplot_colors[:gray20], # tick color
44+
:tick_direction => :out,
45+
:foreground_color_border => :white, # axis color
46+
:foreground_color_text => _ggplot_colors[:gray30], # tick labels
47+
:gridlinewidth => 1,
48+
#tick label size => *0.8,
49+
### Grid
50+
:foreground_color_grid => :white,
51+
:gridalpha => 1,
52+
### Minor Grid
53+
:minorgrid => true,
54+
:minorgridalpha => 1,
55+
:minorgridlinewidth => 0.5, # * 0.5
56+
:foreground_color_minor_grid => :white,
57+
#foreground_color_minortick=>:white, ## not yet implemented
58+
:minorticks => 2,
59+
## Lines and markers
60+
:markerstrokealpha => 0,
61+
:markerstrokewidth => 0,
62+
] |> Dict |> PlotTheme

‎PlotThemes/src/gruvbox.jl‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,38 +61,31 @@ const _gruvbox_colors = Dict(
6161
:faded_orange => RGB255(175, 58, 3),
6262
)
6363

64-
const _gruvbox_dark = PlotTheme(
65-
Dict(
66-
[
67-
:bg => _gruvbox_colors[:dark2],
68-
:bginside => _gruvbox_colors[:dark0],
69-
:fg => _gruvbox_colors[:light3],
70-
:fgtext => _gruvbox_colors[:light3],
71-
:fgguide => _gruvbox_colors[:dark1],
72-
:fglegend => _gruvbox_colors[:light3],
73-
:palette => expand_palette(
74-
_gruvbox_colors[:dark3],
75-
[_gruvbox_colors[c] for c in _gruvbox_dark_palette],
76-
),
77-
:colorgradient => cgrad(:YlOrRd, rev = true),
78-
]
64+
const _gruvbox_dark = [
65+
:bg => _gruvbox_colors[:dark2],
66+
:bginside => _gruvbox_colors[:dark0],
67+
:fg => _gruvbox_colors[:light3],
68+
:fgtext => _gruvbox_colors[:light3],
69+
:fgguide => _gruvbox_colors[:dark1],
70+
:fglegend => _gruvbox_colors[:light3],
71+
:palette => expand_palette(
72+
_gruvbox_colors[:dark3],
73+
[_gruvbox_colors[c] for c in _gruvbox_dark_palette],
7974
),
80-
)
75+
:colorgradient => cgrad(:YlOrRd, rev = true),
76+
] |> Dict |> PlotTheme
77+
8178

82-
const _gruvbox_light = PlotTheme(
83-
Dict(
84-
[
85-
:bg => _gruvbox_colors[:light1],
86-
:bginside => _gruvbox_colors[:light0],
87-
:fg => _gruvbox_colors[:dark1],
88-
:fgtext => _gruvbox_colors[:dark1],
89-
:fgguide => _gruvbox_colors[:dark1],
90-
:fglegend => _gruvbox_colors[:dark1],
91-
:palette => expand_palette(
92-
_gruvbox_colors[:light3],
93-
[_gruvbox_colors[c] for c in _gruvbox_light_palette],
94-
),
95-
:colorgradient => cgrad(:YlOrRd, rev = true),
96-
]
79+
const _gruvbox_light = [
80+
:bg => _gruvbox_colors[:light1],
81+
:bginside => _gruvbox_colors[:light0],
82+
:fg => _gruvbox_colors[:dark1],
83+
:fgtext => _gruvbox_colors[:dark1],
84+
:fgguide => _gruvbox_colors[:dark1],
85+
:fglegend => _gruvbox_colors[:dark1],
86+
:palette => expand_palette(
87+
_gruvbox_colors[:light3],
88+
[_gruvbox_colors[c] for c in _gruvbox_light_palette],
9789
),
98-
)
90+
:colorgradient => cgrad(:YlOrRd, rev = true),
91+
] |> Dict |> PlotTheme

‎PlotThemes/src/juno.jl‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@ const juno_palette = [
88

99
const juno_bg = colorant"#282C34"
1010

11-
const _juno = PlotTheme(
12-
Dict(
13-
[
14-
:bg => juno_bg,
15-
:bginside => colorant"#21252B",
16-
:fg => colorant"#ADB2B7",
17-
:fgtext => colorant"#9EB1BE",
18-
:fgguide => colorant"#9EB1BE",
19-
:fglegend => colorant"#9EB1BE",
20-
:palette =>
21-
expand_palette(juno_bg, juno_palette; lchoices = [57], cchoices = [100]),
22-
:colorgradient => :fire,
23-
]
24-
),
25-
)
11+
const _juno = [
12+
:bg => juno_bg,
13+
:bginside => colorant"#21252B",
14+
:fg => colorant"#ADB2B7",
15+
:fgtext => colorant"#9EB1BE",
16+
:fgguide => colorant"#9EB1BE",
17+
:fglegend => colorant"#9EB1BE",
18+
:palette =>
19+
expand_palette(juno_bg, juno_palette; lchoices = [57], cchoices = [100]),
20+
:colorgradient => :fire,
21+
] |> Dict |> PlotTheme

‎PlotThemes/src/lime.jl‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ const lime_palette = reverse(
1212

1313
const black = lime_palette[6]
1414

15-
const _lime = PlotTheme(
16-
Dict(
17-
[
18-
:bg => black,
19-
:bginside => black,
20-
:fg => lime_palette[1],
21-
:fgtext => lime_palette[2],
22-
:fgguide => lime_palette[2],
23-
:fglegend => lime_palette[2],
24-
:palette => expand_palette(black, lime_palette[1:4]),
25-
:colorgradient => :viridis,
26-
]
27-
),
28-
)
15+
const _lime = [
16+
:bg => black,
17+
:bginside => black,
18+
:fg => lime_palette[1],
19+
:fgtext => lime_palette[2],
20+
:fgguide => lime_palette[2],
21+
:fglegend => lime_palette[2],
22+
:palette => expand_palette(black, lime_palette[1:4]),
23+
:colorgradient => :viridis,
24+
] |> Dict |> PlotTheme

‎PlotThemes/src/orange.jl‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@ const orange_palette = reverse(
1111
)
1212
const _black = orange_palette[5]
1313

14-
const _orange = PlotTheme(
15-
Dict(
16-
[
17-
:bg => _black,
18-
:bginside => _black,
19-
:fg => orange_palette[1],
20-
:fgtext => orange_palette[2],
21-
:fgguide => orange_palette[2],
22-
:fglegend => orange_palette[2],
23-
:palette => expand_palette(black, orange_palette[1:4]),
24-
:colorgradient => :viridis,
25-
]
26-
),
27-
)
14+
const _orange = [
15+
:bg => _black,
16+
:bginside => _black,
17+
:fg => orange_palette[1],
18+
:fgtext => orange_palette[2],
19+
:fgguide => orange_palette[2],
20+
:fglegend => orange_palette[2],
21+
:palette => expand_palette(black, orange_palette[1:4]),
22+
:colorgradient => :viridis,
23+
] |> Dict |> PlotTheme

0 commit comments

Comments
 (0)