Changeset 26473

Timestamp:

10/05/21 18:44:52 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/jl

Files:

• exp.jl (modified) (1 diff)
• plotmodel.jl (modified) (3 diffs)

issm/trunk-jpl/src/jl/exp.jl

@@ +1 @@
+#for exptool, look into this http://juliaplots.org/MakieReferenceImages/gallery//mouse_picking/index.html
 
 #exp object definition, constructor, and disp

issm/trunk-jpl/src/jl/plotmodel.jl

@@ -1 @@
-
-#import ColorSchemes.leonardo
-#include("issm.jl")
+import ColorSchemes.jet
 
 using GLMakie
 
-function plotmodel(md::model)
+function plotmodel(md::model,data)
 
-        elementcolor = :yellow
         vertexcolor  = :black
         facetcolor   = :blue
@@ -13 +10 @@
         showfacets   = true
 
-        scene = Makie.mesh( [md.mesh.x md.mesh.y], md.mesh.elements, shading = false, color = elementcolor)
+        if data isa AbstractVector
+
+                if length(data)==md.mesh.numberofelements
+                        # vector of polygons
+                        x = md.mesh.x
+                        y = md.mesh.y
+                        index = md.mesh.elements
+                        ps = [Makie.GeometryBasics.Polygon([Point2(x[index[i,1]], y[index[i,1]]), Point2(x[index[i,2]], y[index[i,2]]), Point2(x[index[i,3]], y[index[i,3]])])
+                                        for i in 1:md.mesh.numberofelements]
+
+                        fig, ax, h = Makie.poly(ps, color = data, colormap = jet)
+
+                        #Add colorbar
+                        Colorbar(fig[1, 2], limits = (minimum(data), maximum(data)), colormap = jet)
+                elseif length(data)==md.mesh.numberofvertices
+                        fig, ax, h = Makie.mesh( [md.mesh.x md.mesh.y], md.mesh.elements, shading = false, color = data, colormap = jet)
+
+                        #Add colorbar
+                        Colorbar(fig[1, 2], h, width=25)
+                else
+                        error("data of size "*string(length(data))*" not supported yet!")
+                end
+        else
+                # default to single color
+                @assert length(data)==1
+                fig, ax, h = Makie.mesh( [md.mesh.x md.mesh.y], md.mesh.elements, shading = false, color = data, colormap = jet)
+        end
 
         if showvertices
@@ -19 +42 @@
         end
 
-
-        return scene
+        return fig
 end