diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3463b5d..04fcf11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: version: - - '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'. + - '1.9' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'. - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia. - 'nightly' os: diff --git a/Project.toml b/Project.toml index a7e95aa..ddb59c8 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "GridVisualize" uuid = "5eed8a63-0fb0-45eb-886d-8d5a387d12b8" authors = ["Juergen Fuhrmann "] -version = "1.5.1" +version = "1.6" [deps] ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4" @@ -21,13 +21,13 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" [compat] -CairoMakie = "0.11.3" +CairoMakie = "0.11.3, 0.12" ColorSchemes = "3" Colors = "0.12,1" DocStringExtensions = "0.8,0.9" ElasticArrays = "1" ExtendableGrids = "0.9,1" -GLMakie = "0.9" +GLMakie = "0.9, 0.10" GeometryBasics = "0.4.1" GridVisualizeTools = "1.1" HypertextLiteral = "0.9" @@ -41,14 +41,8 @@ PlutoVista = "0.8.24,1" Printf = "1.6" PyPlot = "2" StaticArrays = "1" -julia = "1.6" +julia = "1.9" -[extras] -CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" -Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -PlutoVista = "646e1f28-b900-46d7-9d87-d554eb38a413" -PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" [weakdeps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" diff --git a/src/makie.jl b/src/makie.jl index 2766c79..fe8df07 100644 --- a/src/makie.jl +++ b/src/makie.jl @@ -396,7 +396,6 @@ function scalarplot!(ctx, TP::Type{MakieType}, ::Type{Val{1}}, grids, parentgrid map(a -> a[1:ctx[:markevery]:end], ctx[:lines][l]); color = RGB(ctx[:color]), marker = ctx[:markershape], - markercolor = RGB(ctx[:color]), markersize = ctx[:markersize],) end @@ -977,8 +976,6 @@ function gridplot!(ctx, TP::Type{MakieType}, ::Type{Val{3}}, grid) XMakie.wireframe!(ctx[:scene], map(d -> d[i], ctx[:cellmeshes]); color = :black, - strokecolor = :black, - strokewidth = ctx[:linewidth], linewidth = ctx[:linewidth],) end end @@ -1004,7 +1001,6 @@ function gridplot!(ctx, TP::Type{MakieType}, ::Type{Val{3}}, grid) XMakie.wireframe!(ctx[:scene], map(d -> d[i], ctx[:facemeshes]); color = :black, - strokecolor = :black, linewidth = ctx[:linewidth],) end end