Fix themes for new Makie resolution (#28)

* Fix themes for new Makie resolution * don't be evil
MakieOrg · Feb 6, 2024 · 2ad534a · 2ad534a · asinghvi17 · Feb 6, 2024
1 parent 3d6b390
commit 2ad534a
Show file tree

Hide file tree

Showing 46 changed files with 68 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
-/Manifest.toml
-img/demofigure/*.png
-img/demoscatter/*.png
+/Manifest.toml
diff --git a/docs/make.jl b/docs/make.jl
@@ -58,6 +58,7 @@ makedocs(;
         "BBC" => "themes/bbc.md",
         "API" => "api.md"
     ],
+    warnonly = true,
 )
 
 deploydocs(;

diff --git a/docs/src/themes/bbc.md b/docs/src/themes/bbc.md
@@ -20,4 +20,8 @@ MakieThemes.demoscatter(theme_bbc())
 <img src="../../assets/img/demoscatter/bbc.png" alt="BBC theme" width="900"/>
 ```
 
-The `finalize_plot` functionality in `bbplot` is planned for the near future, so stay tuned!
+The `finalize_plot` functionality in `bbplot` is planned for the near future, so stay tuned!
+
+```@docs
+theme_bbc
+```
diff --git a/ggthemr.md b/ggthemr.md
@@ -4,68 +4,68 @@ This emulates the themes from [the R gghthemr library](https://github.com/cttobi
 
 ### flat
 
-<img src="img/flat.png" alt="flat" width="400"/>
+<img src="img/demofigure/flat.png" alt="flat" width="400"/>
 
 ### dust
 
-<img src="img/dust.png" alt="dust" width="400"/>
+<img src="img/demofigure/dust.png" alt="dust" width="400"/>
 
 ### fresh
 
-<img src="img/fresh.png" alt="fresh" width="400"/>
+<img src="img/demofigure/fresh.png" alt="fresh" width="400"/>
 
 ### carrot
 
-<img src="img/carrot.png" alt="carrot" width="400"/>
+<img src="img/demofigure/carrot.png" alt="carrot" width="400"/>
 
 ### flat_dark
 
-<img src="img/flat_dark.png" alt="carrot" width="400"/>
+<img src="img/demofigure/flat_dark.png" alt="carrot" width="400"/>
 
 ### sky
 
-<img src="img/sky.png" alt="sky" width="400"/>
+<img src="img/demofigure/sky.png" alt="sky" width="400"/>
 
 ### copper
 
-<img src="img/copper.png" alt="copper" width="400"/>
+<img src="img/demofigure/copper.png" alt="copper" width="400"/>
 
 ### light
 
-<img src="img/light.png" alt="light" width="400"/>
+<img src="img/demofigure/light.png" alt="light" width="400"/>
 
 ### pale
 
-<img src="img/pale.png" alt="pale" width="400"/>
+<img src="img/demofigure/pale.png" alt="pale" width="400"/>
 
 ### solarized
 
-<img src="img/solarized.png" alt="solarized" width="400"/>
+<img src="img/demofigure/solarized.png" alt="solarized" width="400"/>
 
 ### sea
 
-<img src="img/sea.png" alt="sea" width="400"/>
+<img src="img/demofigure/sea.png" alt="sea" width="400"/>
 
 ### chalk
 
-<img src="img/chalk.png" alt="chalk" width="400"/>
+<img src="img/demofigure/chalk.png" alt="chalk" width="400"/>
 
 ### greyscale
 
-<img src="img/greyscale.png" alt="greyscale" width="400"/>
+<img src="img/demofigure/greyscale.png" alt="greyscale" width="400"/>
 
 ### earth
 
-<img src="img/earth.png" alt="earth" width="400"/>
+<img src="img/demofigure/earth.png" alt="earth" width="400"/>
 
 ### lilac
 
-<img src="img/lilac.png" alt="lilac" width="400"/>
+<img src="img/demofigure/lilac.png" alt="lilac" width="400"/>
 
 ### grass
 
-<img src="img/grass.png" alt="grass" width="400"/>
+<img src="img/demofigure/grass.png" alt="grass" width="400"/>
 
 ### grape
 
-<img src="img/grape.png" alt="grape" width="400"/>
+<img src="img/demofigure/grape.png" alt="grape" width="400"/>
diff --git a/img/demofigure/bbc.png b/img/demofigure/bbc.png
diff --git a/img/demofigure/carrot.png b/img/demofigure/carrot.png
diff --git a/img/demofigure/chalk.png b/img/demofigure/chalk.png
diff --git a/img/demofigure/copper.png b/img/demofigure/copper.png
diff --git a/img/demofigure/default.png b/img/demofigure/default.png
diff --git a/img/demofigure/dust.png b/img/demofigure/dust.png
diff --git a/img/demofigure/earth.png b/img/demofigure/earth.png
diff --git a/img/demofigure/flat.png b/img/demofigure/flat.png
diff --git a/img/demofigure/flat_dark.png b/img/demofigure/flat_dark.png
diff --git a/img/demofigure/fresh.png b/img/demofigure/fresh.png
diff --git a/img/demofigure/grape.png b/img/demofigure/grape.png
diff --git a/img/demofigure/grass.png b/img/demofigure/grass.png
diff --git a/img/demofigure/greyscale.png b/img/demofigure/greyscale.png
diff --git a/img/demofigure/light.png b/img/demofigure/light.png
diff --git a/img/demofigure/lilac.png b/img/demofigure/lilac.png
diff --git a/img/demofigure/pale.png b/img/demofigure/pale.png
diff --git a/img/demofigure/sea.png b/img/demofigure/sea.png
diff --git a/img/demofigure/sky.png b/img/demofigure/sky.png
diff --git a/img/demofigure/solarized.png b/img/demofigure/solarized.png
diff --git a/img/demoscatter/bbc.png b/img/demoscatter/bbc.png
diff --git a/img/demoscatter/carrot.png b/img/demoscatter/carrot.png
diff --git a/img/demoscatter/chalk.png b/img/demoscatter/chalk.png
diff --git a/img/demoscatter/copper.png b/img/demoscatter/copper.png
diff --git a/img/demoscatter/default.png b/img/demoscatter/default.png
diff --git a/img/demoscatter/dust.png b/img/demoscatter/dust.png
diff --git a/img/demoscatter/earth.png b/img/demoscatter/earth.png
diff --git a/img/demoscatter/flat.png b/img/demoscatter/flat.png
diff --git a/img/demoscatter/flat_dark.png b/img/demoscatter/flat_dark.png
diff --git a/img/demoscatter/fresh.png b/img/demoscatter/fresh.png
diff --git a/img/demoscatter/grape.png b/img/demoscatter/grape.png
diff --git a/img/demoscatter/grass.png b/img/demoscatter/grass.png
diff --git a/img/demoscatter/greyscale.png b/img/demoscatter/greyscale.png
diff --git a/img/demoscatter/light.png b/img/demoscatter/light.png
diff --git a/img/demoscatter/lilac.png b/img/demoscatter/lilac.png
diff --git a/img/demoscatter/pale.png b/img/demoscatter/pale.png
diff --git a/img/demoscatter/sea.png b/img/demoscatter/sea.png
diff --git a/img/demoscatter/sky.png b/img/demoscatter/sky.png
diff --git a/img/demoscatter/solarized.png b/img/demoscatter/solarized.png
diff --git a/img/ggthemr_full_fresh.png b/img/ggthemr_full_fresh.png
diff --git a/src/BBC.jl b/src/BBC.jl
@@ -14,15 +14,15 @@ const bbc_yellow = Makie.to_color(colorant"#FAAB18")
 function style_bbc(spinewidth = 1.5, gridwidth = 1.5)
 
     return Attributes(
-        fontsize = 18,
-        textsize = 18,
+        # fontsize = 15,
+        # textsize = 15,
         Axis = (
-            titlesize = 28,
+            titlesize = 20,
             titlefont = :bold,
-            titlegap = 9f0,
+            titlegap = 4f0,
             titlealign = :left,
-            subtitlesize = 22,
-            subtitlegap = 9f0,
+            # subtitlesize = 14,
+            subtitlegap = 6f0,
             subtitlealign = :left,
             topspinevisible = false,
             rightspinevisible = false,
@@ -33,8 +33,8 @@ function style_bbc(spinewidth = 1.5, gridwidth = 1.5)
             yticksvisible = false,
             xticklabelsvisible = false,
             yticklabelsvisible = true,
-            xticklabelsize = 18,
-            yticklabelsize = 18,
+            # xticklabelsize = 14,
+            # yticklabelsize = 14,
             xminorgridvisible = false,
             yminorgridvisible = false,
             xgridvisible = false,
@@ -43,15 +43,16 @@ function style_bbc(spinewidth = 1.5, gridwidth = 1.5)
             ygridwidth = gridwidth,
         ),
         Axis3 = (
-            titlesize = 28,
+            titlesize = 20,
             titlefont = :bold,
-            titlegap = 9f0,
-            subtitlesize = 22,
-            subtitlegap = 9f0,
+            titlegap = 6f0,
+            # subtitlesize = 14,
+            subtitlegap = 6f0,
         ),
         Legend = (
             framevisible = false, 
-            labelsize = 18,
+            rowgap = 0,
+            # labelsize = 14,
         ),
         # once Makie can support multiple faces in one font file,
         # uncomment the following:

diff --git a/src/GGThemr.jl b/src/GGThemr.jl
@@ -5,11 +5,12 @@ using Makie, Colors
 
 export theme_ggthemr, ggthemr, style_ggthemr, color_ggthemr, ggthemr_colorthemes
 
+const ColorTheme = Dict{Symbol, Dict{Symbol, Any}}()
 
 ggthemr_colorthemes() = collect(keys(ColorTheme))
 
 
-function style_ggthemr(basewidth = 2, spinewidth = basewidth * 0.75) 
+function style_ggthemr(basewidth = 1.25, spinewidth = basewidth * 0.75) 
     return Attributes(
         linewidth = basewidth,
 
@@ -30,6 +31,8 @@ function style_ggthemr(basewidth = 2, spinewidth = basewidth * 0.75)
             ygridwidth = basewidth,
             xgridstyle = :dash,
             ygridstyle = :dash,
+            xticksize = 2.5,
+            yticksize = 2.5,
         ),
 
         Axis3 = Attributes(
@@ -42,13 +45,18 @@ function style_ggthemr(basewidth = 2, spinewidth = basewidth * 0.75)
             xgridstyle = :dash,
             ygridstyle = :dash,
             zgridstyle = :dash,
+            xlabeloffset = 30,
+            ylabeloffset = 30,
+            zlabeloffset = 30,
         ),
         Legend = Attributes(
             backgroundcolor = :transparent,
             framevisible = false,
+            rowgap = 0,
+            titlegap = 0,
         ),
         Scatter = Attributes(
-            markersize = 15,
+            markersize = 10,
             strokewidth = 0,
         ),
     )
@@ -113,10 +121,27 @@ function theme_ggthemr(theme::Symbol)
     merge(style_ggthemr(), color_ggthemr(theme))
 end
 
-ggthemr(theme) = theme_ggthemr(theme)
+"""
+    ggthemr(theme::Symbol)
 
-const ColorTheme = Dict{Symbol, Dict{Symbol, Any}}()
+Return a Makie theme based on the `theme` from the `ggthemr` package.
+
+To view a sample image, you can use `MakieThemes.demofigure(ggthemr(theme))`.
 
+Available themes are:
+
+$(join(map(x -> "`:$(string(x))`", ggthemr_colorthemes()), ", ", " and ")).
+
+## Usage:
+```julia
+Makie.set_theme!(ggthemr(:fresh))
+# or
+Makie.with_theme(ggthemr(:fresh)) do
+    # your plotting code here
+end
+```
+"""
+ggthemr(theme) = theme_ggthemr(theme)
 
 ColorTheme[:fresh] = Dict(
   :background => "#ffffff",

diff --git a/src/MakieThemes.jl b/src/MakieThemes.jl
@@ -26,7 +26,7 @@ function demofigure(theme::Attributes = Makie.current_default_theme())
         f = Makie.Figure()
         ax = Makie.Axis(f[1, 1],
             title = "Measurements",
-            subtitle = "Example-5000 oscilloscope at 3 Hz",
+            subtitle = "Ex-9000 oscilloscope at 3 Hz",
             xlabel = "time (s)",
             ylabel = "amplitude")