Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct spelling #4522

Merged
merged 8 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
- `boundingbox` overwrites must now include a secondary space argument to work `boundingbox(plot, space::Symbol = :data)` [#3723](https://github.com/MakieOrg/Makie.jl/pull/3723)
- `boundingbox` now always consider `transform_func` and `model`
- `data_limits(::Scatter)` and `boundingbox(::Scatter)` now consider marker transformations [#3716](https://github.com/MakieOrg/Makie.jl/pull/3716)
- **Breaking** Improved Float64 compatability of Axis [#3681](https://github.com/MakieOrg/Makie.jl/pull/3681)
- **Breaking** Improved Float64 compatibility of Axis [#3681](https://github.com/MakieOrg/Makie.jl/pull/3681)
- This added an extra conversion step which only takes effect when Float32 precision becomes relevant. In those cases code using `project()` functions will be wrong as the transformation is not applied. Use `project(plot_or_scene, ...)` or apply the conversion yourself beforehand with `Makie.f32_convert(plot_or_scene, transformed_point)` and use `patched_model = Makie.patch_model(plot_or_scene, model)`.
- `Makie.to_world(point, matrix, resolution)` has been deprecated in favor of `Makie.to_world(scene_or_plot, point)` to include float32 conversions.
- **Breaking** Reworked line shaders in GLMakie and WGLMakie [#3558](https://github.com/MakieOrg/Makie.jl/pull/3558)
Expand Down Expand Up @@ -230,7 +230,7 @@
## [0.20.7] - 2024-02-04

- Equalized alignment point of mirrored ticks to that of normal ticks [#3598](https://github.com/MakieOrg/Makie.jl/pull/3598).
- Fixed stack overflow error on conversion of gridlike data with missings [#3597](https://github.com/MakieOrg/Makie.jl/pull/3597).
- Fixed stack overflow error on conversion of gridlike data with `missing`s [#3597](https://github.com/MakieOrg/Makie.jl/pull/3597).
- Fixed mutation of CairoMakie src dir when displaying png files [#3588](https://github.com/MakieOrg/Makie.jl/pull/3588).
- Added better error messages for plotting into `FigureAxisPlot` and `AxisPlot` as Plots.jl users are likely to do [#3596](https://github.com/MakieOrg/Makie.jl/pull/3596).
- Added compat bounds for IntervalArithmetic.jl due to bug with DelaunayTriangulation.jl [#3595](https://github.com/MakieOrg/Makie.jl/pull/3595).
Expand All @@ -246,7 +246,7 @@
- Use plot plot instead of scene transform functions in CairoMakie, fixing missplaced h/vspan. [#3552](https://github.com/MakieOrg/Makie.jl/pull/3552)
- Fix error printing on shader error [#3530](https://github.com/MakieOrg/Makie.jl/pull/3530).
- Update pagefind to 1.0.4 for better headline search [#3534](https://github.com/MakieOrg/Makie.jl/pull/3534).
- Remove unecessary deps, e.g. Setfield [3546](https://github.com/MakieOrg/Makie.jl/pull/3546).
- Remove unnecessary deps, e.g. Setfield [3546](https://github.com/MakieOrg/Makie.jl/pull/3546).
- Don't clear args, rely on delete deregister_callbacks [#3543](https://github.com/MakieOrg/Makie.jl/pull/3543).
- Add interpolate keyword for Surface [#3541](https://github.com/MakieOrg/Makie.jl/pull/3541).
- Fix a DataInspector bug if inspector_label is used with RGB images [#3468](https://github.com/MakieOrg/Makie.jl/pull/3468).
Expand Down Expand Up @@ -591,7 +591,7 @@ role as `datalimits` in `violin` [#2137](https://github.com/MakieOrg/Makie.jl/pu
- **Breaking** Cleaned up `Scene` type [#1192](https://github.com/MakieOrg/Makie.jl/pull/1192), [#1393](https://github.com/MakieOrg/Makie.jl/pull/1393). The `Scene()` constructor doesn't create any axes or limits anymore. All keywords like `raw`, `show_axis` have been removed. A scene now always works like it did when using the deprecated `raw=true`. All the high level functionality like showing an axis and adding a 3d camera has been moved to `LScene`. See the new `Scene` tutorial for more info: https://docs.makie.org/dev/tutorials/scenes/.
- **Breaking** Lights got moved to `Scene`, see the [lighting docs](https://docs.makie.org/stable/documentation/lighting) and [RPRMakie examples](https://docs.makie.org/stable/documentation/backends/rprmakie/).
- Added ECDF plot [#1310](https://github.com/MakieOrg/Makie.jl/pull/1310).
- Added Order Independent Transparency to GLMakie [#1418](https://github.com/MakieOrg/Makie.jl/pull/1418), [#1506](https://github.com/MakieOrg/Makie.jl/pull/1506). This type of transparency is now used with `transpareny = true`. The old transparency handling is available with `transparency = false`.
- Added Order Independent Transparency to GLMakie [#1418](https://github.com/MakieOrg/Makie.jl/pull/1418), [#1506](https://github.com/MakieOrg/Makie.jl/pull/1506). This type of transparency is now used with `transparency = true`. The old transparency handling is available with `transparency = false`.
- Fixed blurry text in GLMakie and WGLMakie [#1494](https://github.com/MakieOrg/Makie.jl/pull/1494).
- Introduced a new experimental backend for ray tracing: [RPRMakie](https://docs.makie.org/stable/documentation/backends/rprmakie/).
- Added the `Cycled` type, which can be used to select the i-th value from the current cycler for a specific attribute [#1248](https://github.com/MakieOrg/Makie.jl/pull/1248).
Expand Down
2 changes: 1 addition & 1 deletion CairoMakie/src/infrastructure.jl
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ end
function draw_plot_as_image(scene::Scene, screen::Screen{RT}, primitive::Plot, scale::Number = 1) where RT
# you can provide `p.rasterize = scale::Int` or `p.rasterize = true`, both of which are numbers

# Extract scene width in device indepentent units
# Extract scene width in device independent units
w, h = size(scene)
# Create a new Screen which renders directly to an image surface,
# specifically for the plot's parent scene.
Expand Down
4 changes: 2 additions & 2 deletions CairoMakie/src/primitives.jl
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ end
function draw_mesh2D(screen, per_face_cols, vs::Vector{<: Point2}, fs::Vector{GLTriangleFace})

ctx = screen.context
# Priorize colors of the mesh if present
# Prioritize colors of the mesh if present
# This is a hack, which needs cleaning up in the Mesh plot type!

for (f, (c1, c2, c3)) in zip(fs, per_face_cols)
Expand Down Expand Up @@ -984,7 +984,7 @@ function draw_mesh3D(
meshuvs = map(uv -> uv_transform * to_ndim(Vec3f, uv, 1), meshuvs)
end

# Priorize colors of the mesh if present
# Prioritize colors of the mesh if present
color = hasproperty(mesh, :color) ? mesh.color : to_value(attributes.calculated_colors)
per_face_col = per_face_colors(color, matcap, meshfaces, meshnormals, meshuvs)

Expand Down
2 changes: 1 addition & 1 deletion CairoMakie/test/svg_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end
@test svg_isnt_rasterized(poly(MultiPolyWrapper([poly1, poly1]); color=[:red, :blue]))
end

@testset "reproducable svg ids" begin
@testset "reproducible svg ids" begin
# https://github.com/MakieOrg/Makie.jl/issues/2406
f, ax, sc = scatter(1:10)
save("test1.svg", f)
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/src/GLAbstraction/AbstractGPUArray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ max_dim(t) = error("max_dim not implemented for: $(typeof(t)). This happen

function (::Type{GPUArrayType})(data::Observable; kw...) where GPUArrayType <: GPUArray
gpu_mem = GPUArrayType(data[]; kw...)
# TODO merge these and handle update tracking during contruction
# TODO merge these and handle update tracking during construction
obs2 = on(new_data -> update!(gpu_mem, new_data), data)
if GPUArrayType <: TextureBuffer
push!(gpu_mem.buffer.observers, obs2)
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/src/GLAbstraction/GLAbstraction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export update! # updates a gpu array with a Julia array
export gpu_data # gets the data of a gpu array as a Julia Array

export RenderObject # An object which holds all GPU handles and datastructes to ready for rendering by calling render(obj)
export prerender! # adds a function to a RenderObject, which gets executed befor setting the OpenGL render state
export prerender! # adds a function to a RenderObject, which gets executed before setting the OpenGL render state
export postrender! # adds a function to a RenderObject, which gets executed after setting the OpenGL render states
export extract_renderable
export set_arg!
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/src/GLAbstraction/GLRender.jl
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function renderinstanced(vao::GLVertexArray{GLBuffer{T}}, amount::Integer, primi
end

"""
Renders `amount` instances of an not indexed geoemtry geometry
Renders `amount` instances of an not indexed geometry geometry
"""
function renderinstanced(vao::GLVertexArray, amount::Integer, primitive=GL_TRIANGLES)
glDrawElementsInstanced(primitive, length(vao), GL_UNSIGNED_INT, C_NULL, amount)
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/src/GLAbstraction/GLRenderObject.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function (sp::StandardPrerender)()
glDepthFunc(GL_LEQUAL)
end

# Disable cullface for now, untill all rendering code is corrected!
# Disable cullface for now, until all rendering code is corrected!
glDisable(GL_CULL_FACE)
# glCullFace(GL_BACK)

Expand Down
4 changes: 2 additions & 2 deletions GLMakie/src/GLAbstraction/GLTexture.jl
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ default_colorformat_sym(::Type{T}) where {T <: Colorant} = default_colorformat_s
@generated function default_colorformat(::Type{T}) where T
sym = default_colorformat_sym(T)
if !isdefined(ModernGL, sym)
error("$T doesn't have a propper mapping to an OpenGL format")
error("$T doesn't have a proper mapping to an OpenGL format")
end
:($sym)
end
Expand Down Expand Up @@ -462,7 +462,7 @@ end
@generated function default_internalcolorformat(::Type{T}) where T
sym = default_internalcolorformat_sym(T)
if !isdefined(ModernGL, sym)
error("$T doesn't have a propper mapping to an OpenGL format")
error("$T doesn't have a proper mapping to an OpenGL format")
end
:($sym)
end
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/src/GLAbstraction/GLTypes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ function RenderObject(
program = gl_convert(to_value(program), data) # "compile" lazyshader
vertexarray = GLVertexArray(Dict(buffers), program)

# remove all uniforms not occuring in shader
# remove all uniforms not occurring in shader
# ssao, instances transparency are special for rendering passes. TODO do this more cleanly
special = Set([:ssao, :transparency, :instances, :fxaa, :num_clip_planes])
for k in setdiff(keys(data), keys(program.nametype))
Expand Down
6 changes: 3 additions & 3 deletions GLMakie/src/GLAbstraction/GLUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gen_defaults! dict begin
a = 55
b = a * 2 # variables, like a, will get made visible in local scope
c::JuliaType = X # `c` needs to be of type JuliaType. `c` will be made available with it's original type and then converted to JuliaType when inserted into `dict`
d = x => GLType # OpenGL convert target. Get's only applied if `x` is convertible to GLType. Will only be converted when passed to RenderObject
d = x => GLType # OpenGL convert target. Gets only applied if `x` is convertible to GLType. Will only be converted when passed to RenderObject
d = x => \"doc string\"
d = x => (GLType, \"doc string and gl target\")
end
Expand All @@ -39,12 +39,12 @@ macro gen_defaults!(dict, args)
a = 55
b = a * 2 # variables, like a, will get made visible in local scope
c::JuliaType = X # c needs to be of type JuliaType. c will be made available with it's original type and then converted to JuliaType when inserted into data
d = x => GLType # OpenGL convert target. Get's only applied if x is convertible to GLType. Will only be converted when passed to RenderObject
d = x => GLType # OpenGL convert target. Gets only applied if x is convertible to GLType. Will only be converted when passed to RenderObject
end")
tuple_list = args.args
dictsym = gensym()
return_expression = Expr(:block)
push!(return_expression.args, :($dictsym = $dict)) # dict could also be an expression, so we need to asign it to a variable at the beginning
push!(return_expression.args, :($dictsym = $dict)) # dict could also be an expression, so we need to assign it to a variable at the beginning
push!(return_expression.args, :(gl_convert_targets = get!($dictsym, :gl_convert_targets, Dict{Symbol, Any}()))) # exceptions for glconvert.
push!(return_expression.args, :(doc_strings = get!($dictsym, :doc_string, Dict{Symbol, Any}()))) # exceptions for glconvert.
# @gen_defaults can be used multiple times, so we need to reuse gl_convert_targets if already in here
Expand Down
8 changes: 4 additions & 4 deletions GLMakie/src/glshaders/lines.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function sumlengths(points, resolution)
# normalize w component if availabke
# normalize w component if available
f(p::VecTypes{4}) = p[Vec(1, 2)] / p[4]
f(p::VecTypes) = p[Vec(1, 2)]

Expand Down Expand Up @@ -45,10 +45,10 @@ function generate_indices(positions)
# if A != F (no loop): 0 A B C D E F 0
# where 0 is NaN
# It marks vertices as invalid (0) if they are NaN, valid (1) if they
# are part of a continous line section, or as ghost edges (2) used to
# are part of a continuous line section, or as ghost edges (2) used to
# cleanly close a loop. The shader detects successive vertices with
# 1-2-0 and 0-2-1 validity to avoid drawing ghost segments (E-A from
# 0-E-A-B and F-B from E-F-B-0 which would dublicate E-F and A-B)
# 0-E-A-B and F-B from E-F-B-0 which would duplicate E-F and A-B)

last_start_pos = eltype(ps)(NaN)
last_start_idx = -1
Expand All @@ -60,7 +60,7 @@ function generate_indices(positions)
if not_nan
if last_start_idx == -1
# place nan before section of line vertices
# (or dublicate ps[1])
# (or duplicate ps[1])
push!(indices, i-1)
last_start_idx = length(indices) + 1
last_start_pos = p
Expand Down
4 changes: 2 additions & 2 deletions GLMakie/src/screen.jl
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ function destroy!(rob::RenderObject)
# but we do share the texture atlas, so we check v !== tex, since we can't just free shared resources

# TODO, refcounting, or leaving freeing to GC...
# GC is a bit tricky with active contexts, so immediate free is prefered.
# GC is a bit tricky with active contexts, so immediate free is preferred.
# I guess as long as we make it hard for users to share buffers directly, this should be fine!
GLAbstraction.free(v)
end
Expand Down Expand Up @@ -978,7 +978,7 @@ function renderloop(screen)
end
if screen.close_after_renderloop
try
@debug("Closing screen after quiting renderloop!")
@debug("Closing screen after quitting renderloop!")
close(screen)
catch e
@warn "error closing screen" exception=(e, Base.catch_backtrace())
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/test/glmakie_refimages.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using ReferenceTests.RNG
# Directly access texture parameters:
x = Sampler(fill(to_color(:yellow), 100, 100), minfilter=:nearest)
scene = image(x)
# indexing will go straight to the GPU, while only transfering the changes
# indexing will go straight to the GPU, while only transferring the changes
st = Stepper(scene)
x[1:10, 1:50] .= to_color(:red)
Makie.step!(st)
Expand Down
2 changes: 1 addition & 1 deletion GLMakie/test/unit_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ end
end
end

@testset "emtpy!(fig)" begin
@testset "empty!(fig)" begin
GLMakie.closeall()
fig = Figure()
ax = Axis(fig[1,1])
Expand Down
2 changes: 1 addition & 1 deletion MakieCore/src/conversion.jl
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ to be overloaded for DimConversions, e.g. for CategoricalConversion:
`has_typed_convert(plot_or_trait)` and `should_dim_convert(get_element_type(args))`
are true. The former is defined as true by `@convert_target`, i.e. when
`convert_arguments_typed` is defined for the given plot type or conversion trait.
The latter marks specific types as convertable.
The latter marks specific types as convertible.

If a recipe wants to use dim conversions, it should overload this function:
```julia
Expand Down
2 changes: 1 addition & 1 deletion RPRMakie/src/meshes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function to_rpr_object(context, matsys, scene, plot::Makie.Surface)
positions = lift(grid, x, y, z, Makie.transform_func_obs(plot))
r = Tesselation(Rect2f((0, 0), (1, 1)), size(z[]))
# decomposing a rectangle into uv and triangles is what we need to map the z coordinates on
# since the xyz data assumes the coordinates to have the same neighouring relations
# since the xyz data assumes the coordinates to have the same neighbouring relations
# like a grid
faces = decompose(GLTriangleFace, r)
uv = decompose_uv(r)
Expand Down
4 changes: 2 additions & 2 deletions ReferenceTests/src/tests/categorical.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using Makie: Categorical
end

@reference_test "different types without sorting function" begin
# If we set the ticks explicitely, with sortby defaulting to nothing,
# If we set the ticks explicitly, with sortby defaulting to nothing,
# we can combine all objects:
f = Figure()
ax = Axis(f[1, 1];
Expand Down Expand Up @@ -42,7 +42,7 @@ end
f
end

@reference_test "new categories, inbetween old values" begin
@reference_test "new categories, in between old values" begin
obs = Observable(Categorical(["a", "c", "e", "g"]))
f, ax, p = scatter(1:4, obs, markersize=20, color=1:4, colormap=:viridis)
obs[] = Categorical(["b", "d", "f", "h"])
Expand Down
2 changes: 1 addition & 1 deletion ReferenceTests/src/tests/primitives.jl
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ end
campixel!(scene)
# marker is in front, so it should not be smaller than the background rectangle
plot_row!(scene, 0, false)
# marker is in the background, so one shouldnt see a single pixel of the marker
# marker is in the background, so one shouldn't see a single pixel of the marker
plot_row!(scene, 300, true)

center = Point2f(size(scene) ./ 2)
Expand Down
2 changes: 1 addition & 1 deletion ReferenceUpdater/src/local_server.jl
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function group_files(path, input_filename, output_filename)
end
end

# generate new structed file
# generate new structured file
open(joinpath(path, output_filename), "w") do file
for (filename, valid) in data
println(file,
Expand Down
2 changes: 1 addition & 1 deletion ReferenceUpdater/src/reference_images.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h2>Images with references</h2>
This is the normal case where the selected CI run produced an image and the reference image exists.
Each row shows one image per backend from the same reference image test, which can be compared with its reference image.
Rows are sorted based on the maximum row score (bigger = more different).
Red cells fail CI (assuming the thresholds are up to date), yellow cells may but likely don't have signficant visual difference and gray cells are visually equivalent.
Red cells fail CI (assuming the thresholds are up to date), yellow cells may but likely don't have significant visual difference and gray cells are visually equivalent.
<br><br>
<div id="refimage-list" class="image-list"></div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions WGLMakie/src/display.jl
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ function render_with_init(screen::Screen, session::Session, scene::Scene)
if isready(screen.plot_initialized)
# plot_initialized contains already an item
# This should not happen, but lets check anyways, so it errors and doesn't hang forever
error("Plot inititalized multiple times?")
error("Plot initialized multiple times?")
end
if initialized == true
put!(screen.plot_initialized, true)
mark_as_displayed!(screen, scene)
else
# Will be an eror from WGLMakie.js
# Will be an error from WGLMakie.js
put!(screen.plot_initialized, initialized)
end
return
Expand Down Expand Up @@ -230,7 +230,7 @@ function get_screen_session(screen::Screen; timeout=100,
success = Bonito.wait_for(() -> isready(screen.plot_initialized); timeout=timeout)
# Throw error if error message specified
if success !== :success
throw_error("Timed out waiting $(timeout)s for session to get initilize")
throw_error("Timed out waiting $(timeout)s for session to get initialize")
return nothing
end
value = fetch(screen.plot_initialized)
Expand Down Expand Up @@ -316,7 +316,7 @@ function insert_scene!(session::Session, screen::Screen, scene::Scene)
scene_ser = serialize_scene(scene)
parent = scene.parent
parent_uuid = js_uuid(parent)
err = "Cant find scene js_uuid(scene) == $(parent_uuid)"
err = "Cannot find scene js_uuid(scene) == $(parent_uuid)"
evaljs_value(session, js"""
$(WGL).then(WGL=> {
const parent = WGL.find_scene($(parent_uuid));
Expand Down
Loading
Loading