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.

Sign up for GitHub

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

Jump to bottom

Move Arc to MakieCore #3668

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Move Arc to MakieCore #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1222258
move Arc to MakieCore
jw3126 Mar 2, 2024
36f1c97
update Project.toml
jw3126 Mar 2, 2024
be5e2b7
bump
jw3126 Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CairoMakie/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FileIO = "1.1"
FreeType = "3, 4.0"
GeometryBasics = "0.4.1"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.20.8"
Makie = "=0.20.9"
PrecompileTools = "1.0"
julia = "1.3"

Expand Down
2 changes: 1 addition & 1 deletion GLMakie/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ FreeTypeAbstraction = "0.10"
GLFW = "3.3"
GeometryBasics = "0.4.1"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.20.8"
Makie = "=0.20.9"
Markdown = "1.0, 1.6"
MeshIO = "0.4"
ModernGL = "1"
Expand Down
2 changes: 1 addition & 1 deletion MakieCore/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MakieCore"
uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
authors = ["Simon Danisch"]
version = "0.7.3"
version = "0.7.4"

[deps]
Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
Expand Down
7 changes: 7 additions & 0 deletions MakieCore/src/basic_plots.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,3 +609,10 @@ end
get!(attr, :arrowcolor, attr[:linecolor])
return attr
end

@recipe(Arc, origin, radius, start_angle, stop_angle) do scene
Attributes(;
default_theme(scene, Lines)...,
resolution = 361,
)
end
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Makie"
uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
authors = ["Simon Danisch", "Julius Krumbiegel"]
version = "0.20.8"
version = "0.20.9"

[deps]
Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
Expand Down Expand Up @@ -89,7 +89,7 @@ KernelDensity = "0.5, 0.6"
LaTeXStrings = "1.2"
LinearAlgebra = "1.0, 1.6"
MacroTools = "0.5"
MakieCore = "=0.7.3"
MakieCore = "=0.7.4"
Markdown = "1.0, 1.6"
MathTeXEngine = "0.5"
Observables = "0.5.5"
Expand Down
2 changes: 1 addition & 1 deletion RPRMakie/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Colors = "0.9, 0.10, 0.11, 0.12"
FileIO = "1.6"
GeometryBasics = "0.4.1"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.20.8"
Makie = "=0.20.9"
Printf = "1.0, 1.6"
RadeonProRender = "0.3.0"
julia = "1.3"
Expand Down
2 changes: 1 addition & 1 deletion WGLMakie/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FreeTypeAbstraction = "0.10"
GeometryBasics = "0.4.1"
Hyperscript = "0.0.3, 0.0.4, 0.0.5"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.20.8"
Makie = "=0.20.9"
Observables = "0.5.1"
PNGFiles = "0.3, 0.4"
PrecompileTools = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/Makie.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ import Base: getindex, setindex!, push!, append!, parent, get, get!, delete!, ha
using Observables: listeners, to_value, notify

using MakieCore: SceneLike, MakieScreen, ScenePlot, AbstractScene, AbstractPlot, Transformable, Attributes, Plot, Theme, Plot
using MakieCore: Arrows, Heatmap, Image, Lines, LineSegments, Mesh, MeshScatter, Poly, Scatter, Surface, Text, Volume, Wireframe
using MakieCore: Arc, Arrows, Heatmap, Image, Lines, LineSegments, Mesh, MeshScatter, Poly, Scatter, Surface, Text, Volume, Wireframe
using MakieCore: ConversionTrait, NoConversion, PointBased, GridBased, VertexGrid, CellGrid, ImageLike, VolumeLike
using MakieCore: Key, @key_str, Automatic, automatic, @recipe
using MakieCore: Pixel, px, Unit, Billboard
Expand All @@ -88,8 +88,8 @@ using MakieCore: not_implemented_for
import MakieCore: plot, plot!, theme, plotfunc, plottype, merge_attributes!, calculated_attributes!,
get_attribute, plotsym, plotkey, attributes, used_attributes
import MakieCore: create_axis_like, create_axis_like!, figurelike_return, figurelike_return!
import MakieCore: arrows, heatmap, image, lines, linesegments, mesh, meshscatter, poly, scatter, surface, text, volume
import MakieCore: arrows!, heatmap!, image!, lines!, linesegments!, mesh!, meshscatter!, poly!, scatter!, surface!, text!, volume!
import MakieCore: arc, arrows, heatmap, image, lines, linesegments, mesh, meshscatter, poly, scatter, surface, text, volume
import MakieCore: arc!, arrows!, heatmap!, image!, lines!, linesegments!, mesh!, meshscatter!, poly!, scatter!, surface!, text!, volume!
import MakieCore: convert_arguments, convert_attribute, default_theme, conversion_trait

export @L_str, @colorant_str
Expand Down
7 changes: 1 addition & 6 deletions src/basic_recipes/arc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ Examples:
## Attributes
$(ATTRIBUTES)
"""
@recipe(Arc, origin, radius, start_angle, stop_angle) do scene
Attributes(;
default_theme(scene, Lines)...,
resolution = 361,
)
end
Arc

function plot!(p::Arc)
args = getindex.(p, (:origin, :radius, :start_angle, :stop_angle, :resolution))
Expand Down