use rgbtuple in pyplot for named colors

WIAS-PDELib · Sep 7, 2021 · 33b1463 · 33b1463 · j-fu · Sep 7, 2021
1 parent 4545183
commit 33b1463
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/examples/plutovista.jl b/examples/plutovista.jl
@@ -182,7 +182,7 @@ end
 # ╔═╡ 412c905f-050c-4b78-a66f-0d03978e7edf
 begin
 	vis=GridVisualizer(resolution=(300,300),Plotter=PlutoVista)
-	myplot2(t)=scalarplot!(vis,grid,f(t),show=true,flimits=(-π/2,π/2))
+	myplot2(t)=scalarplot!(vis,grid,f(t),show=true,clear=true,flimits=(-π/2,π/2))
 end
 
 # ╔═╡ 6f1707ed-79ab-42dc-8ad8-d66a9e1a65b3

diff --git a/src/common.jl b/src/common.jl
@@ -13,7 +13,7 @@ region_cmap(n)=distinguishable_colors(max(5,n),
 """
 $(SIGNATURES)
 
-Create custumized distinguishable colormap for boundary regions
+Create customized distinguishable colormap for boundary regions
 """
 bregion_cmap(n)=distinguishable_colors(max(5,n),
                                       [RGB(1,0,0), RGB(0,1,0), RGB(0,0,1)],

diff --git a/src/pyplot.jl b/src/pyplot.jl
@@ -343,30 +343,30 @@ function scalarplot!(ctx, TP::Type{PyPlotType}, ::Type{Val{1}},grid, func::Abstr
             x1=coord[1,i1]
             x2=coord[1,i2]
             if icell==1
-                ax.plot([x1,x2],[func[i1],func[i2]],color=ctx[:color],label=ctx[:label])
+                ax.plot([x1,x2],[func[i1],func[i2]],color=rgbtuple(ctx[:color]),label=ctx[:label])
             else
-                ax.plot([x1,x2],[func[i1],func[i2]],color=ctx[:color])
+                ax.plot([x1,x2],[func[i1],func[i2]],color=rgbtuple(ctx[:color]))
             end                
         end
     else
         if ctx[:markershape]==:none
             if ctx[:label]!==""
                 ax.plot(coord[1,:],func,
                         linestyle=lstyles[ctx[:linestyle]],
-                        color=ctx[:color],
+                        color=rgbtuple(ctx[:color]),
                         linewidth=ctx[:linewidth],
                         label=ctx[:label])
             else
                 ax.plot(coord[1,:],func,
                         linestyle=lstyles[ctx[:linestyle]],
                         linewidth=ctx[:linewidth],
-                        color=ctx[:color])
+                        color=rgbtuple(ctx[:color]))
             end
         else
             if ctx[:label]!==""
                 ax.plot(coord[1,:],func,
                         linestyle=lstyles[ctx[:linestyle]],
-                        color=ctx[:color],
+                        color=rgbtuple(ctx[:color]),
                         label=ctx[:label],
                         marker=mshapes[ctx[:markershape]],
                         markevery=ctx[:markevery],
@@ -376,7 +376,7 @@ function scalarplot!(ctx, TP::Type{PyPlotType}, ::Type{Val{1}},grid, func::Abstr
             else
                 ax.plot(coord[1,:],func,
                         linestyle=lstyles[ctx[:linestyle]],
-                        color=ctx[:color],
+                        color=rgbtuple(ctx[:color]),
                         marker=mshapes[ctx[:markershape]],
                         markevery=ctx[:markevery],
                         markersize=ctx[:markersize],