Merge pull request #56 from JonasIsensee/master

update to current Makie version

Author: fverdugo

NEWS.md

@@ -12,6 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.0] - 2021-08-23
 
 ### Added
-- Visualization of vertices, edges, and faces of Gridap `Triangulaiton` objects made of simplices.
+- Visualization of vertices, edges, and faces of Gridap `Triangulation` objects made of simplices.
 - Visualization of scalar-valued `CellField` and related objects on `Triangulaiton` objects made of simplices.
 

Project.toml

@@ -1,7 +1,7 @@
 name = "GridapMakie"
 uuid = "41f30b06-6382-4b60-a5f7-79d86b35bf5d"
 authors = ["Alberto F. Martín <alberto.martin@monash.edu>","Eric Neiva <eneiva@cimne.upc.edu>","Pau Riera <pau.riera.p@gmail.com>","Francesc Verdugo <fverdugo@cimne.upc.edu>", "Jan Weidner <jw3126@gmail.com>", "Other contributors"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
@@ -13,13 +13,13 @@ Gridap = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 
 [compat]
-CairoMakie = "0.5, 0.6"
+CairoMakie = "0.5, 0.6, 0.8"
 FileIO = "1"
-FillArrays = "0.11, 0.12"
-GLMakie = "0.3, 0.4"
-GeometryBasics = "0.3"
+FillArrays = "0.11, 0.12, 0.13"
+GLMakie = "0.3, 0.4, 0.6"
+GeometryBasics = "0.3, 0.4"
 Gridap = "0.16, 0.17"
-Makie = "0.13, 0.15"
+Makie = "0.13, 0.15, 0.17"
 julia = "1.6"
 
 [extras]

docs/Project.toml

@@ -1,5 +1,4 @@
 [deps]
-AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 GridapMakie = "41f30b06-6382-4b60-a5f7-79d86b35bf5d"

src/conversions.jl

@@ -1,4 +1,4 @@
-# Two different plot functions depending on the need of having a continuous or discontinuous mesh. 
+# Two different plot functions depending on the need of having a continuous or discontinuous mesh.
 function to_plot_dg_mesh(grid::Grid)
   UnstructuredGrid(grid) |> to_plot_dg_mesh
 end
@@ -177,4 +177,4 @@ function to_grid(trian::Triangulation, uh::Any)
 end
 
 to_scalar(x) = x
-to_scalar(x::VectorValue) = norm(x)
+to_scalar(x::VectorValue) = norm(x)

src/recipes.jl

@@ -41,7 +41,7 @@ mesh_theme = Makie.Theme(
 function Makie.default_theme(scene,::Type{<:Makie.Mesh{<:Tuple{PlotGrid}}})
     merge!(
         mesh_theme,
-        Makie.default_theme(scene, Makie.Mesh) 
+        Makie.default_theme(scene, Makie.Mesh)
     )
 end
 
@@ -119,9 +119,9 @@ Makie.plottype(::Triangulation) = Makie.Mesh
     )
 end
 
-# We explicitly set the colorrange property of p to (min, max) of the color provided. Here, when we use mesh(), 
-# Makie fills the attribute plots of p (p.plots) with the given attributes. Hence, p.plots[1] inherits the colorrange 
-# of p (this is just to draw colorbars). Another way would be using $ Colorbar(fig[1,2], plt.plots[1]), but quite less 
+# We explicitly set the colorrange property of p to (min, max) of the color provided. Here, when we use mesh(),
+# Makie fills the attribute plots of p (p.plots) with the given attributes. Hence, p.plots[1] inherits the colorrange
+# of p (this is just to draw colorbars). Another way would be using $ Colorbar(fig[1,2], plt.plots[1]), but quite less
 # appealing from the point of view of the user.
 function Makie.plot!(p::MeshField{<:Tuple{Triangulation, Any}})
     trian, uh = p[1:2]
@@ -152,4 +152,9 @@ function Makie.plot!(p::MeshField{<:Tuple{CellField}})
     )
 end
 
-Makie.plottype(::CellField) = MeshField
+Makie.plottype(::CellField) = MeshField
+
+
+function Makie.point_iterator(pg::PlotGrid)
+    UnstructuredGrid(pg.grid) |> to_dg_points
+end