format

JuliaPlots · Nov 12, 2024 · a477795 · a477795
1 parent 83ab73d
commit a477795
Show file tree

Hide file tree

Showing 36 changed files with 454 additions and 370 deletions.
diff --git a/.github/workflows/format_check.yml b/.github/workflows/format_check.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Format Julia files
         run: |
           using JuliaFormatter
-          format(["RecipesBase", "RecipesPipeline", "PlotsBase", "src", "test", "GraphRecipes", "StatsPlots"])
+          format(["RecipesBase", "RecipesPipeline", "PlotsBase", "src", "test", "GraphRecipes", "StatsPlots", "PlotThemes"])
         shell: julia --color=yes --compile=min -O0 {0}
 
       - name: suggester / JuliaFormatter

diff --git a/PlotThemes/src/PlotThemes.jl b/PlotThemes/src/PlotThemes.jl
@@ -4,16 +4,16 @@ using PlotUtils
 
 export add_theme, theme_palette, PlotTheme
 
-_255_to_1(c::Symbol, colors) = RGBA(map(x-> x/255,colors[c])...)
-RGB255(r,g,b) = RGB(r/255, g/255, b/255)
+_255_to_1(c::Symbol, colors) = RGBA(map(x -> x / 255, colors[c])...)
+RGB255(r, g, b) = RGB(r / 255, g / 255, b / 255)
 
 function expand_palette(bg, cs; kwargs...)
     colors = palette(cs).colors.colors
     c = convert.(RGBA, distinguishable_colors(20, vcat(bg, colors); kwargs...))[2:end]
     return palette(c)
 end
 
-const KW = Dict{Symbol, Any}
+const KW = Dict{Symbol,Any}
 
 struct PlotTheme
     defaults::KW
@@ -33,7 +33,6 @@ function theme_palette(s::Symbol)
     end
 end
 
-
 # add themes
 include("dark.jl")
 include("ggplot2.jl")
@@ -50,8 +49,7 @@ include("dao.jl")
 include("dracula.jl")
 include("rose_pine.jl")
 
-
-const _themes = Dict{Symbol, PlotTheme}([
+const _themes = Dict{Symbol,PlotTheme}([
     :default => PlotTheme(),
     :dao => _dao,
     :dark => _dark,
@@ -72,14 +70,9 @@ const _themes = Dict{Symbol, PlotTheme}([
     :orange => _orange,
     :dracula => _dracula,
     :rose_pine => _rose_pine,
-    :rose_pine_dawn => _rose_pine_dawn
-
+    :rose_pine_dawn => _rose_pine_dawn,
 ])
 
-
-function add_theme(s::Symbol, thm::PlotTheme)
-    _themes[s] = thm
-end
-
+add_theme(s::Symbol, thm::PlotTheme) = _themes[s] = thm
 
 end # module
diff --git a/PlotThemes/src/boxed.jl b/PlotThemes/src/boxed.jl
@@ -1,16 +1,21 @@
-const _boxed = PlotTheme(Dict([
-    :minorticks => true,
-    :grid => false,
-    :frame => :box,
-    :guidefontvalign => :top,
-    :guidefonthalign => :right,
-    :foreground_color_legend  =>  nothing,
-    :legendfontsize => 9,
-    :legend  => :topright,
-    :xlim => (:auto,:auto),
-    :ylim => (:auto,:auto),
-    :label => "",
-    :palette => expand_palette(colorant"white", [RGB(0,0,0); wong_palette];
-        lchoices = [57],
-        cchoices = [100])
-    ]))
+const _boxed = PlotTheme(
+    Dict([
+        :minorticks => true,
+        :grid => false,
+        :frame => :box,
+        :guidefontvalign => :top,
+        :guidefonthalign => :right,
+        :foreground_color_legend => nothing,
+        :legendfontsize => 9,
+        :legend => :topright,
+        :xlim => (:auto, :auto),
+        :ylim => (:auto, :auto),
+        :label => "",
+        :palette => expand_palette(
+            colorant"white",
+            [RGB(0, 0, 0); wong_palette];
+            lchoices = [57],
+            cchoices = [100],
+        ),
+    ]),
+)
diff --git a/PlotThemes/src/dao.jl b/PlotThemes/src/dao.jl
@@ -4,25 +4,27 @@ const dao_palette = [
     colorant"#707070",
     colorant"#21ab74",
     colorant"#ba3030",
-    colorant"#9467bd"
+    colorant"#9467bd",
 ]
 
-const _dao = PlotTheme(Dict([
-    :background => :white,
-    :framestyle => :box,
-    :grid => true,
-    :gridalpha => 0.4,
-    :linewidth => 1.4,
-    :markerstrokewidth => 0,
-    :fontfamily => "Computer Modern",
-    :colorgradient => :magma,
-    :guidefontsize => 12,
-    :titlefontsize => 12,
-    :tickfontsize => 8,
-    :palette => dao_palette,
-    :minorgrid => true,
-    :minorticks => 5,
-    :gridlinewidth => 0.7,
-    :minorgridalpha => 0.06,
-    :legend => :outertopright])
+const _dao = PlotTheme(
+    Dict([
+        :background => :white,
+        :framestyle => :box,
+        :grid => true,
+        :gridalpha => 0.4,
+        :linewidth => 1.4,
+        :markerstrokewidth => 0,
+        :fontfamily => "Computer Modern",
+        :colorgradient => :magma,
+        :guidefontsize => 12,
+        :titlefontsize => 12,
+        :tickfontsize => 8,
+        :palette => dao_palette,
+        :minorgrid => true,
+        :minorticks => 5,
+        :gridlinewidth => 0.7,
+        :minorgridalpha => 0.06,
+        :legend => :outertopright,
+    ]),
 )
diff --git a/PlotThemes/src/dark.jl b/PlotThemes/src/dark.jl
@@ -3,20 +3,23 @@ const dark_palette = [
     colorant"#FE4365", # red
     colorant"#eca25c", # orange
     colorant"#3f9778", # green
-    colorant"#005D7F" # blue
+    colorant"#005D7F", # blue
 ]
 const dark_bg = colorant"#363D46"
 
-const _dark = PlotTheme(Dict([
-    :bg => dark_bg,
-    :bginside => colorant"#30343B",
-    :fg => colorant"#ADB2B7",
-    :fgtext => colorant"#FFFFFF",
-    :fgguide => colorant"#FFFFFF",
-    :fglegend => colorant"#FFFFFF",
-    :legendfontcolor => colorant"#FFFFFF",
-    :legendtitlefontcolor => colorant"#FFFFFF",
-    :titlefontcolor => colorant"#FFFFFF",
-    :palette => expand_palette(dark_bg, dark_palette; lchoices = [57], cchoices = [100]),
-    :colorgradient => :fire])
+const _dark = PlotTheme(
+    Dict([
+        :bg => dark_bg,
+        :bginside => colorant"#30343B",
+        :fg => colorant"#ADB2B7",
+        :fgtext => colorant"#FFFFFF",
+        :fgguide => colorant"#FFFFFF",
+        :fglegend => colorant"#FFFFFF",
+        :legendfontcolor => colorant"#FFFFFF",
+        :legendtitlefontcolor => colorant"#FFFFFF",
+        :titlefontcolor => colorant"#FFFFFF",
+        :palette =>
+            expand_palette(dark_bg, dark_palette; lchoices = [57], cchoices = [100]),
+        :colorgradient => :fire,
+    ]),
 )
diff --git a/PlotThemes/src/dracula.jl b/PlotThemes/src/dracula.jl
@@ -13,16 +13,18 @@ const dracula_palette = [
 const dracula_bg = colorant"#282a36"
 const dracula_fg = colorant"#f8f8f2"
 
-const _dracula = PlotTheme(Dict([
-    :bg => dracula_bg,
-    :bginside => colorant"#30343B",
-    :fg => dracula_fg,
-    :fgtext => dracula_fg,
-    :fgguide => dracula_fg,
-    :fglegend => dracula_fg,
-    :legendfontcolor => dracula_fg,
-    :legendtitlefontcolor => dracula_fg,
-    :titlefontcolor => dracula_fg,
-    :palette => expand_palette(dracula_bg, dracula_palette),
-    :colorgradient => :viridis])
+const _dracula = PlotTheme(
+    Dict([
+        :bg => dracula_bg,
+        :bginside => colorant"#30343B",
+        :fg => dracula_fg,
+        :fgtext => dracula_fg,
+        :fgguide => dracula_fg,
+        :fglegend => dracula_fg,
+        :legendfontcolor => dracula_fg,
+        :legendtitlefontcolor => dracula_fg,
+        :titlefontcolor => dracula_fg,
+        :palette => expand_palette(dracula_bg, dracula_palette),
+        :colorgradient => :viridis,
+    ]),
 )
diff --git a/PlotThemes/src/ggplot2.jl b/PlotThemes/src/ggplot2.jl
@@ -26,39 +26,40 @@
 const _ggplot_colors = Dict(
     :gray92 => RGB(fill(0.92, 3)...),
     :gray20 => RGB(fill(0.2, 3)...),
-    :gray30 => RGB(fill(0.3, 3)...)
-    )
-
+    :gray30 => RGB(fill(0.3, 3)...),
+)
 
-const _ggplot2 = PlotTheme(Dict([
-    ## Background etc
-    :bg => :white,
-    :bginside => _ggplot_colors[:gray92],
-    :bglegend => _ggplot_colors[:gray92],
-    :fglegend => :white,
-    :fgguide => :black,
-    :widen=>true,
-    ## Axes / Ticks
-    #framestyle => :grid,
-    #foreground_color_tick => _ggplot_colors[:gray20], # tick color not yet implemented
-    :foreground_color_axis => _ggplot_colors[:gray20], # tick color
-    :tick_direction=>:out,
-    :foreground_color_border =>:white, # axis color
-    :foreground_color_text => _ggplot_colors[:gray30], # tick labels
-    :gridlinewidth => 1,
-    #tick label size => *0.8,
-    ### Grid
-    :foreground_color_grid => :white,
-    :gridalpha => 1,
-    ### Minor Grid
-    :minorgrid => true,
-    :minorgridalpha => 1,
-    :minorgridlinewidth=>0.5, # * 0.5
-    :foreground_color_minor_grid=>:white,
-    #foreground_color_minortick=>:white, ## not yet implemented
-    :minorticks => 2,
-    ## Lines and markers
-    :markerstrokealpha => 0,
-    :markerstrokewidth => 0 ])
+const _ggplot2 = PlotTheme(
+    Dict([
+        ## Background etc
+        :bg => :white,
+        :bginside => _ggplot_colors[:gray92],
+        :bglegend => _ggplot_colors[:gray92],
+        :fglegend => :white,
+        :fgguide => :black,
+        :widen => true,
+        ## Axes / Ticks
+        #framestyle => :grid,
+        #foreground_color_tick => _ggplot_colors[:gray20], # tick color not yet implemented
+        :foreground_color_axis => _ggplot_colors[:gray20], # tick color
+        :tick_direction => :out,
+        :foreground_color_border => :white, # axis color
+        :foreground_color_text => _ggplot_colors[:gray30], # tick labels
+        :gridlinewidth => 1,
+        #tick label size => *0.8,
+        ### Grid
+        :foreground_color_grid => :white,
+        :gridalpha => 1,
+        ### Minor Grid
+        :minorgrid => true,
+        :minorgridalpha => 1,
+        :minorgridlinewidth => 0.5, # * 0.5
+        :foreground_color_minor_grid => :white,
+        #foreground_color_minortick=>:white, ## not yet implemented
+        :minorticks => 2,
+        ## Lines and markers
+        :markerstrokealpha => 0,
+        :markerstrokewidth => 0,
+    ]),
     #showaxis=> :false
 )