Feature to include RGBA colormaps, updated to 3.4.5

Project.toml

@@ -1,7 +1,7 @@
 name = "PGFPlots"
 uuid = "3b7a836e-365b-5785-a47d-02c71176b4aa"
 repo = "https://github.com/JuliaTeX/PGFPlots.jl.git"
-version = "3.4.4"
+version = "3.4.5"
 
 [deps]
 ColorBrewer = "a2cac450-b92f-5266-8821-25eda20663c8"

src/PGFPlots.jl

@@ -5,7 +5,7 @@ export plot, tikzCode, ErrorBars, Axis, Axes, PolarAxis, SmithAxis, TernaryAxis,
 export pushPGFPlotsOptions, popPGFPlotsOptions, resetPGFPlotsOptions, pgfplotsoptions
 export pushPGFPlotsPreamble, popPGFPlotsPreamble, resetPGFPlotsPreamble, pgfplotspreamble
 export pushPGFPlots, popPGFPlots
-import Colors: RGB
+import Colors: RGB, RGBA
 import Contour: contours, levels
 
 using Requires
@@ -93,6 +93,10 @@ function define_color(name::AbstractString, color::RGB)
     _pgfplotspreamble[end] = _pgfplotspreamble[end] * "\n\\definecolor{$name}{rgb}{$(color.r), $(color.g), $(color.b)}"
 end
 
+function define_color(name::AbstractString, color::RGBA)
+    _pgfplotspreamble[end] = _pgfplotspreamble[end] * "\n\\definecolor{$name}{rgba}{$(color.r), $(color.g), $(color.b), $(color.alpha)}"
+end
+
 define_color(name::AbstractString, color) = define_color(name, convert(RGB, color))
 
 function define_color(name::AbstractString, color::Vector{T}) where {T<:AbstractFloat}
@@ -108,9 +112,15 @@ function define_color(name::AbstractString, color::Vector{T}) where {T<:Abstract
 end
 
 function define_color(name::AbstractString, color::Vector{T}) where {T<:Integer}
-    @assert(length(color) == 3, "Color must have three components")
-    r, g, b = color[1], color[2], color[3]
-    _pgfplotspreamble[end] = _pgfplotspreamble[end] * "\n\\definecolor{$name}{RGB}{$r, $g, $b}"
+    if length(color) == 3
+        r, g, b = color
+        _pgfplotspreamble[end] = _pgfplotspreamble[end] * "\n\\definecolor{$name}{RGB}{$r, $g, $b}"
+    elseif length(color) == 4
+        r, g, b, alpha = color
+        _pgfplotspreamble[end] = _pgfplotspreamble[end] * "\n\\definecolor{$name}{RGBA}{$r, $g, $b, $alpha}"
+    else
+        error("The color vector should be either [r,g,b] or [r,g,b,alpha].")
+    end
 end
 
 function define_color(name::AbstractString, color::UInt32)
@@ -845,9 +855,14 @@ function colormapOptions(cm::ColorMaps.RGBArrayMap)
     o = IOBuffer()
     print(o, "colormap={mycolormap}{ ")
     n = length(cm.colors)
+    T = typeof(cm.colors)
     for i = 1:n
         c = cm.colors[i]
-        print(o, "rgb($(i-1)cm)=($(c.r),$(c.g),$(c.b)) ")
+        if T <: Vector{RGB}
+            print(o, "rgb($(i-1)cm)=($(c.r),$(c.g),$(c.b)) ")
+        elseif T <: Vector{RGBA}
+            print(o, "rgba($(i-1)cm)=($(c.r),$(c.g),$(c.b),$(c.alpha)) ")
+        end
     end
     print(o, "}")
     String(take!(o))

src/colormaps.jl

@@ -3,7 +3,7 @@ module ColorMaps
 using ColorSchemes
 export ColorMap, GrayMap, Brew, RGBArrayMap, Distinguishable, SparseDistinguishable, write
 import Images: colorview, save, Gray, ImageMeta, clamp01nan 
-import Colors: RGB, distinguishable_colors, colormap
+import Colors: RGB, RGBA, distinguishable_colors, colormap
 import ColorBrewer: palette
 
 abstract type ColorMap end
@@ -13,10 +13,12 @@ mutable struct GrayMap <: ColorMap
     GrayMap(;invert = false) = new(invert)
 end
 
+const ColorVector = AbstractVector{<:Union{RGB{Float64},RGBA{Float64}}}
+
 mutable struct RGBArrayMap <: ColorMap
-    colors::Vector{RGB{Float64}}
+    colors::ColorVector
     interpolation_levels::UInt
-    function RGBArrayMap(colors::AbstractVector{RGB{Float64}}; invert=false, interpolation_levels=0)
+    function RGBArrayMap(colors::ColorVector; invert=false, interpolation_levels=0)
         if invert
             colors = reverse(colors)
         end
@@ -37,7 +39,8 @@ function Distinguishable(n::Integer; invert=false)
 end
 
 function SparseDistinguishable(n, nonzeroidx; zerocolor = RGB{Float64}(1.,1.,1.))
-    m = RGB{Float64}[zerocolor for i = 1:n]
+    T = typeof(zerocolor)
+    m = T[zerocolor for i = 1:n]
     sm = ColorMaps.Distinguishable(length(nonzeroidx))
     for i = 1:length(sm.colors)
         m[nonzeroidx[i]] = sm.colors[i]
@@ -71,7 +74,8 @@ function interpolate_RGBArrayMap(colormap::RGBArrayMap)
     end
 
     n = length(colormap.colors)
-    colors = Vector{RGB{Float64}}(undef,levels)
+    T = typeof(colormap.colors)
+    colors = T(undef,levels)
     for (i,x) in enumerate(range(0.0,stop=1.0,length=levels))
         t = 1 + x*(n-1)
         a = colormap.colors[floor(Int, t)]