Error on unknown plot attributes

MakieCore/src/basic_plots.jl

@@ -157,7 +157,9 @@ Available algorithms are:
         space = :data,
         diffuse=0.4,
         specular=0.2,
-        shininess=32.0f0
+        shininess=32.0f0,
+        enable_depth=true,
+        absorption=1.0,
     )
 end
 
@@ -542,6 +544,9 @@ Plots one or multiple texts passed via the `text` keyword.
         color = theme(scene, :textcolor),
         colormap = theme(scene, :colormap),
         colorrange = automatic,
+        lowclip = automatic,
+        highclip = automatic,
+        nan_color = :transparent,
         font = theme(scene, :font),
         fonts = theme(scene, :fonts),
         strokecolor = (:black, 0.0),

ReferenceTests/src/tests/examples2d.jl

@@ -47,7 +47,7 @@ end
 
 @reference_test "Arrows on hemisphere" begin
     s = Sphere(Point3f(0), 0.9f0)
-    fig, ax, meshplot = mesh(s, transparency=true, alpha=0.05)
+    fig, ax, meshplot = mesh(s)
     pos = decompose(Point3f, s)
     dirs = decompose_normals(s)
     arrows!(ax, pos, dirs, arrowcolor=:red, arrowsize=0.1, linecolor=:red)

ReferenceTests/src/tests/examples3d.jl

@@ -61,7 +61,7 @@ end
     rot = qrotation(Vec3f(1, 0, 0), 0.5pi) * qrotation(Vec3f(0, 1, 0), 0.7pi)
     meshscatter(
         1:3, 1:3, fill(0, 3, 3),
-        marker=catmesh, color=img, markersize=1, rotation=rot,
+        marker=catmesh, color=img, markersize=1, rotations=rot,
         axis=(type=LScene, show_axis=false)
     )
 end

docs/examples/plotting_functions/rainclouds.md

@@ -135,68 +135,3 @@ rainclouds(category_labels, data_array;
     color = colors[indexin(category_labels, unique(category_labels))])
 ```
 \end{examplefigure}
-
-4 of these, between 3 distributions
-Left and Right example
-With and Without Box Plot
-
-\begin{examplefigure}{}
-```julia
-fig = Figure(resolution = (800*2, 600*5))
-colors = [Makie.wong_colors(); Makie.wong_colors()]
-
-category_labels, data_array = mockup_categories_and_data_array(3)
-rainclouds!(Axis(fig[1, 1]), category_labels, data_array;
-    title = "Left Side, with Box Plot",
-    side = :left,
-    plot_boxplots = true,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-rainclouds!(Axis(fig[2, 1]), category_labels, data_array;
-    title = "Left Side, without Box Plot",
-    side = :left,
-    plot_boxplots = false,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-rainclouds!(Axis(fig[1, 2]), category_labels, data_array;
-    title = "Right Side, with Box Plot",
-    side = :right,
-    plot_boxplots = true,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-rainclouds!(Axis(fig[2, 2]), category_labels, data_array;
-    title = "Right Side, without Box Plot",
-    side = :right,
-    plot_boxplots = false,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-# Plots wiht more categories
-# dist_between_categories (0.6, 1.0)
-# with and without clouds
-
-category_labels, data_array = mockup_categories_and_data_array(12)
-rainclouds!(Axis(fig[3, 1:2]), category_labels, data_array;
-    title = "More categories. Default spacing.",
-    plot_boxplots = true,
-    dist_between_categories = 1.0,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-rainclouds!(Axis(fig[4, 1:2]), category_labels, data_array;
-    title = "More categories. Adjust space. (smaller cloud widths and smaller category distances)",
-    plot_boxplots = true,
-    cloud_width = 0.3,
-    dist_between_categories = 0.5,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-
-rainclouds!(Axis(fig[5, 1:2]), category_labels, data_array;
-    title = "More categories. Adjust space. No clouds.",
-    plot_boxplots = true,
-    clouds = nothing,
-    dist_between_categories = 0.5,
-    color = colors[indexin(category_labels, unique(category_labels))])
-
-supertitle = Label(fig[0, :], "Cloud Plot Testing (Scatter, Violin, Boxplot)", fontsize=30)
-fig
-```
-\end{examplefigure}

src/basic_recipes/contours.jl

@@ -155,6 +155,9 @@ function plot!(plot::Contour{<: Tuple{X, Y, Z, Vol}}) where {X, Y, Z, Vol}
     pop!(attr, :labelsize)
     pop!(attr, :labelcolor)
     pop!(attr, :labelformatter)
+    pop!(attr, :linestyle)
+    pop!(attr, :linewidth)
+    pop!(attr, :alpha)
     volume!(plot, attr, x, y, z, volume)
 end
 

src/basic_recipes/hvlines.jl

@@ -84,7 +84,7 @@ function Makie.plot!(p::Union{HLines, VLines})
     notify(p[1])
 
     line_attributes = copy(p.attributes)
-    delete!.(line_attributes, (:ymin, :ymax, :yautolimits))
+    delete!.(line_attributes, (:xmin, :xmax, :ymin, :ymax, :yautolimits))
     linesegments!(p, line_attributes, points)
     p
 end

src/basic_recipes/raincloud.jl

@@ -104,6 +104,9 @@ paired with the scatter plot so the default is to not show them)
 
         color = theme(scene, :patchcolor),
         cycle = [:color => :patchcolor],
+        title = "",
+        xlabel = "",
+        ylabel = "",
     )
 end
 

src/figureplotting.jl

@@ -72,6 +72,7 @@ end
 function plot(P::PlotFunc, gp::GridPosition, args...; axis = NamedTuple(), kwargs...)
 
     _validate_nt_like_keyword(axis, "axis")
+    _disallow_keyword(:figure, kwargs)
 
     f = get_top_parent(gp)
 
@@ -121,6 +122,7 @@ end
 function plot(P::PlotFunc, gsp::GridSubposition, args...; axis = NamedTuple(), kwargs...)
 
     _validate_nt_like_keyword(axis, "axis")
+    _disallow_keyword(:figure, kwargs)
 
     layout = GridLayoutBase.get_layout_at!(gsp.parent, createmissing = true)
     c = contents(gsp, exact = true)

src/interfaces.jl

@@ -218,13 +218,16 @@ function (PlotType::Type{<: AbstractPlot{Typ}})(scene::SceneLike, attributes::At
     # PlotType
 
     FinalType = Combined{Typ, ArgTyp}
+
+    trans = pop!(attributes, :transformation, automatic)
+
     plot_attributes = merged_get!(
         ()-> default_theme(scene, FinalType),
-        plotsym(FinalType), scene, attributes
+        plotsym(FinalType), scene, attributes;
+        allowlist = Set([:text, :xautolimits, :yautolimits, :zautolimits, :interpolate_in_fragment_shader, :label, :fxaa, :rasterize, :model])
     )
 
     # Transformation is a field of the plot type, but can be given as an attribute
-    trans = get(plot_attributes, :transformation, automatic)
     transval = to_value(trans)
     transformation = if transval === automatic
         Transformation(scene)

src/stats/hist.jl

@@ -136,7 +136,8 @@ $(ATTRIBUTES)
         label_offset = 5,
         label_font = theme(scene, :font),
         label_size = 20,
-        label_formatter = bar_label_formatter
+        label_formatter = bar_label_formatter,
+        direction = :x,
     )
 end
 
@@ -180,6 +181,11 @@ function Makie.plot!(plot::Hist)
         x === :values ? :y : x
     end
     # plot the values, not the observables, to be in control of updating
+
+    for key in [:bins, :normalization, :over_background_color, :over_bar_color, :scale_to, :weights]
+        delete!(plot.attributes, key)
+    end
+
     bp = barplot!(plot, points[]; width = widths[], gap = 0, plot.attributes..., fillto=plot.fillto, offset=plot.offset, bar_labels=bar_labels, color=color)
 
     # update the barplot points without triggering, then trigger with `width`

src/utilities/utilities.jl

@@ -255,13 +255,34 @@ function merged_get!(defaults::Function, key, scene, input::Vector{Any})
     return merged_get!(defaults, key, scene, Attributes(input))
 end
 
-function merged_get!(defaults::Function, key, scene::SceneLike, input::Attributes)
+function merged_get!(defaults::Function, key, scene::SceneLike, input::Attributes; allowlist::Set{Symbol} = Set{Symbol}())
     d = defaults()
     if haskey(theme(scene), key)
         # we need to merge theme(scene) with the defaults, because it might be an incomplete theme
         # TODO have a mark that says "theme uncomplete" and only then get the defaults
         d = merge!(to_value(theme(scene, key)), d)
     end
+    sd = setdiff(
+        keys(input),
+        keys(d),
+        allowlist
+    )
+    sd = setdiff(sd, )
+    if !isempty(sd)
+        error("""
+        Found attributes not in the defaults for $(key) or the general allowlist:
+
+        $(join(sort(collect(sd)), ", ", " and "))
+
+        The default attributes for this call were:
+
+        $(isempty(keys(d)) ? "No entries available." : join(sort(collect(keys(d))), ", ", " and "))
+
+        The additional allowlist for this call was:
+
+        $(isempty(allowlist) ? "No entries available." : join(sort(collect(allowlist)), ", ", " and "))
+        """)
+    end
     return merge!(input, d)
 end