mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3436 from gustaphe/master

Browse Source 
Generalize Shape
This commit is contained in:
Daniel Schwabeneder 2021-04-28 18:40:57 +02:00 committed by GitHub
commit e3d13aa17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components.jl
View File

@ -9,9 +9,9 @@ compute_angle(v::P2) = (angle = atan(v[2], v[1]); angle < 0 ? 2π - angle : angl
# ------------------------------------------------------------- # -------------------------------------------------------------
struct Shape struct Shape{X<:Number, Y<:Number}
x::Vector{Float64} x::Vector{X}
y::Vector{Float64} y::Vector{Y}
# function Shape(x::AVec, y::AVec) # function Shape(x::AVec, y::AVec)
# # if x[1] != x[end] || y[1] != y[end] # # if x[1] != x[end] || y[1] != y[end]
# # new(vcat(x, x[1]), vcat(y, y[1])) # # new(vcat(x, x[1]), vcat(y, y[1]))
@ -52,7 +52,7 @@ end
"get an array of tuples of points on a circle with radius `r`" "get an array of tuples of points on a circle with radius `r`"
function partialcircle(start_θ, end_θ, n = 20, r=1) function partialcircle(start_θ, end_θ, n = 20, r=1)
Tuple{Float64,Float64}[(r*cos(u),r*sin(u)) for u in range(start_θ, stop=end_θ, length=n)] [(r*cos(u), r*sin(u)) for u in range(start_θ, stop=end_θ, length=n)]
end end
"interleave 2 vectors into each other (like a zipper's teeth)" "interleave 2 vectors into each other (like a zipper's teeth)"
@ -205,9 +205,12 @@ function rotate!(shape::Shape, Θ::Real, c = center(shape))
end end
"rotate an object in space" "rotate an object in space"
function rotate(shape::Shape, Θ::Real, c = center(shape)) function rotate(shape::Shape, θ::Real, c = center(shape))
shapecopy = deepcopy(shape) x, y = coords(shape)
rotate!(shapecopy, Θ, c) cx, cy = c
x_new = rotate_x.(x, y, θ, cx, cy)
y_new = rotate_y.(x, y, θ, cx, cy)
Shape(x_new, y_new)
end end
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------

5
test/test_components.jl
View File

@ -1,6 +1,11 @@
using Plots, Test using Plots, Test
@testset "Shapes" begin @testset "Shapes" begin
@testset "Type" begin
square = Shape([(0,0.0),(1,0.0),(1,1.0),(0,1.0)])
@test isa(square, Shape{Int64, Float64})
end
@testset "Copy" begin @testset "Copy" begin
square = Shape([(0,0),(1,0),(1,1),(0,1)]) square = Shape([(0,0),(1,0),(1,1),(0,1)])
square2 = Shape(square) square2 = Shape(square)