Improvements to viz of 1D geometries and vectors (#1269)

* Implement viz for lines embedded in 2D space

* Update ext/geometryset.jl

Co-authored-by: Copilot <[email protected]>

* Update ext/geometryset.jl

Co-authored-by: Copilot <[email protected]>

* Fix viz for Rays in 2D and 3D

* Fix Vec visualization in 2D and 3D

* Refactor recipe for Vec in terms of Ray recipe

* Improve comments

---------

Co-authored-by: Copilot <[email protected]>

Author: juliohm

ext/MeshesMakieExt.jl

@@ -53,7 +53,6 @@ include("mesh.jl")
 include("grid.jl")
 include("geometryset.jl")
 include("subdomain.jl")
-include("vector.jl")
 include("fallbacks.jl")
 
 end

ext/fallbacks.jl

@@ -2,21 +2,25 @@
 # Licensed under the MIT License. See LICENSE in the project root.
 # ------------------------------------------------------------------
 
+# generic fallback for geometry
 Makie.plottype(::Geometry) = Viz{<:Tuple{Geometry}}
-Makie.plottype(::Domain) = Viz{<:Tuple{Domain}}
-Makie.plottype(::Vec) = Viz{<:Tuple{Vec}}
-Makie.plottype(::AbstractVector{<:Vec}) = Viz{<:Tuple{AbstractVector{<:Vec}}}
-
 Makie.convert_arguments(::Type{<:Viz}, geom::Geometry) = (GeometrySet([geom]),)
+
+# generic fallback for domain
+Makie.plottype(::Domain) = Viz{<:Tuple{Domain}}
 Makie.convert_arguments(::Type{<:Viz}, domain::Domain) = (GeometrySet(collect(domain)),)
-Makie.convert_arguments(::Type{<:Viz}, vec::Vec) = ([vec],)
 
-# skip conversion for these types
+# skip conversion and use specialized methods
 Makie.convert_arguments(::Type{<:Viz}, mesh::Mesh) = (mesh,)
 Makie.convert_arguments(::Type{<:Viz}, gset::GeometrySet) = (gset,)
 Makie.convert_arguments(::Type{<:Viz}, subdom::SubDomain) = (subdom,)
-Makie.convert_arguments(::Type{<:Viz}, vecs::AbstractVector{<:Vec}) = (vecs,)
 
-# vector of geometries for convenience
+# vector of geometries (for convenience)
 Makie.plottype(::AbstractVector{<:Geometry}) = Viz{<:Tuple{AbstractVector{<:Geometry}}}
 Makie.convert_arguments(::Type{<:Viz}, geoms::AbstractVector{<:Geometry}) = (GeometrySet(geoms),)
+
+# geometric vectors (for convenience)
+Makie.plottype(::Vec) = Viz{<:Tuple{Vec}}
+Makie.convert_arguments(::Type{<:Viz}, vec::Vec) = (GeometrySet([asray(vec)]),)
+Makie.plottype(::AbstractVector{<:Vec}) = Viz{<:Tuple{AbstractVector{<:Vec}}}
+Makie.convert_arguments(::Type{<:Viz}, vecs::AbstractVector{<:Vec}) = (GeometrySet(asray.(vecs)),)

ext/geometryset.jl

@@ -38,25 +38,77 @@ function vizgset!(plot, ::Type{<:𝔼}, ::Val{1}, ::Val, geoms, colorant)
 end
 
 function vizgset!(plot, ::Type{<:𝔼}, ::Val{1}, ::Val, geoms::ObservableVector{<:Ray}, colorant)
-  rset = plot[:object]
   segmentsize = plot[:segmentsize]
   showpoints = plot[:showpoints]
 
-  Dim = embeddim(rset[])
-
-  Dim ∈ (2, 3) || error("not implemented")
+  Dim = embeddim(first(geoms[]))
 
   # visualize as built-in arrows
   orig = Makie.@lift [asmakie(ray(0)) for ray in $geoms]
   dirs = Makie.@lift [asmakie(ray(1) - ray(0)) for ray in $geoms]
-  size = Makie.@lift 0.1 * $segmentsize
-  Makie.arrows!(plot, orig, dirs, color=colorant, arrowsize=size)
+  if Dim == 2
+    tipwidth = Makie.@lift 5 * $segmentsize
+    shaftwidth = Makie.@lift 0.2 * $tipwidth
+    Makie.arrows2d!(plot, orig, dirs, color=colorant, tipwidth=tipwidth, shaftwidth=shaftwidth)
+  elseif Dim == 3
+    tipradius = Makie.@lift 0.05 * $segmentsize
+    shaftradius = Makie.@lift 0.5 * $tipradius
+    Makie.arrows3d!(plot, orig, dirs, color=colorant, tipradius=tipradius, shaftradius=shaftradius)
+  else
+    error("not implemented")
+  end
 
   if showpoints[]
     vizfacets!(plot, geoms)
   end
 end
 
+function vizgset!(plot, ::Type{<:𝔼}, ::Val{1}, ::Val{2}, geoms::ObservableVector{<:Line}, colorant)
+  segmentsize = plot[:segmentsize]
+
+  # split vertical and non-vertical lines
+  inter = Makie.@lift [line ∩ Line((0, 0), (0, 1)) for line in $geoms]
+  vinds = Makie.@lift findall(isnothing, $inter)
+  dinds = Makie.@lift setdiff(1:length($geoms), $vinds)
+
+  # split colors accordingly
+  if colorant[] isa AbstractVector
+    vcolor = Makie.@lift $colorant[$vinds]
+    dcolor = Makie.@lift $colorant[$dinds]
+  else
+    vcolor = colorant
+    dcolor = colorant
+  end
+
+  # visualize vertical lines
+  if !isempty(vinds[])
+    vlines = Makie.@lift $geoms[$vinds]
+    xcoord = Makie.@lift map($vlines) do vline
+      c = coords(vline(0))
+      x = convert(Cartesian, c).x
+      ustrip(x)
+    end
+    Makie.vlines!(plot, xcoord, color=vcolor, linewidth=segmentsize)
+  end
+
+  # visualize non-vertical lines
+  if !isempty(dinds[])
+    dlines = Makie.@lift $geoms[$dinds]
+    dinter = Makie.@lift $inter[$dinds]
+    ycoord = Makie.@lift map($dinter) do point
+      c = coords(point)
+      y = convert(Cartesian, c).y
+      ustrip(y)
+    end
+    slopes = Makie.@lift map($dlines) do dline
+      c1 = convert(Cartesian, coords(dline(0)))
+      c2 = convert(Cartesian, coords(dline(1)))
+      (c2.y - c1.y) / (c2.x - c1.x)
+    end
+    Makie.ablines!(plot, ycoord, slopes, color=dcolor, linewidth=segmentsize)
+  end
+end
+
 function vizgset!(plot, ::Type{<:𝔼}, ::Val{2}, ::Val, geoms, colorant)
   showsegments = plot[:showsegments]
 

ext/utils.jl

@@ -28,6 +28,8 @@ function vizmany!(plot, objs, color)
   viz!(plot, object, color=colors, alpha=alphas, colormap=colormap, pointsize=pointsize, segmentsize=segmentsize)
 end
 
+asray(vec::Vec{Dim,ℒ}) where {Dim,ℒ} = Ray(Point(ntuple(i -> zero(ℒ), Dim)), vec)
+
 asmakie(geoms::AbstractVector{<:Geometry}) = asmakie.(geoms)
 
 asmakie(multis::AbstractVector{<:Multi}) = mapreduce(m -> asmakie.(parent(m)), vcat, multis)