ascolor

Author: guo-yong-zhi

examples/logo.jl

@@ -7,12 +7,12 @@ function cloudshape(height, args...; backgroundcolor=(0, 0, 0, 0))
     r = height / 2
     d = Luxor.Drawing((2height, height)..., :svg)
     Luxor.origin()
-    Luxor.background(parsecolor(backgroundcolor))
-    Luxor.setcolor(parsecolor((0.22, 0.596, 0.149)))
+    Luxor.background(ascolor(backgroundcolor))
+    Luxor.setcolor(ascolor((0.22, 0.596, 0.149)))
     Luxor.pie(0, 0, r, 0, 2π, :fill)
-    Luxor.setcolor(parsecolor((0.584, 0.345, 0.698)))
+    Luxor.setcolor(ascolor((0.584, 0.345, 0.698)))
     Luxor.pie(r, r, r, -π, 0, :fill)
-    Luxor.setcolor(parsecolor((0.796, 0.235, 0.20)))
+    Luxor.setcolor(ascolor((0.796, 0.235, 0.20)))
     Luxor.Luxor.pie(-r, r, r, -π, 0, :fill)
     Luxor.finish()
     WordCloud.SVG(Luxor.svgstring(), d.height, d.width)

examples/recolor.jl

@@ -44,7 +44,7 @@ mixstyleimg = paint(wc, background=background2)
 #md# 
 h, w = size(avgimg)
 lw = 21
-lc = eltype(avgimg)(parsecolor(0.1))
+lc = eltype(avgimg)(ascolor(0.1))
 vbar = zeros(eltype(avgimg), (h, lw))
 hbar = zeros(eltype(avgimg), (lw, 2w + lw))
 vbar[:, lw ÷ 2 + 1] .= lc

examples/semantic.jl

@@ -66,7 +66,7 @@ tree = hclust(D, linkage=:ward)
 lb = cutree(tree, h=3, k=8)
 println("$(length(lb)) words are divided into $(length(unique(lb))) groups")
 #md# 
-colors = parsecolor(:seaborn_dark)
+colors = ascolor(:seaborn_dark)
 setcolors!(wc, words, colors[lb .% length(colors) .+ 1])
 recolor!(wc, style=:reset)
 paint(wc, "semantic_clustering.png")

src/WordCloud.jl

@@ -11,7 +11,7 @@ Please visit the repository at: <https://github.com/guo-yong-zhi/WordCloud.jl>
 """
 module WordCloud
 export wordcloud, processtext, html2text, countwords, casemerge!, rescaleweights
-export parsecolor, rendertext, shape, ellipse, box, squircle, star, ngon, bezistar, bezingon,
+export ascolor, rendertext, shape, ellipse, box, squircle, star, ngon, bezistar, bezingon,
     loadmask, outline, padding, paint, paintsvg, paintcloud, paintsvgcloud, svgstring
 export imageof, showmask, showmask!
 export record, @record, layout!, rescale!, recolor!, keep, ignore, pin, runexample, showexample, generate!, fit!

src/artist.jl

@@ -148,7 +148,7 @@ function randomcolorscheme(weights_or_num=100)
     end
     colors
 end
-# function randomfilteredcolorscheme(args...; filter=colors->Gray(parsecolor(randommaskcolor(colors)))>0.5, maxiter=100)
+# function randomfilteredcolorscheme(args...; filter=colors->Gray(ascolor(randommaskcolor(colors)))>0.5, maxiter=100)
 #     for _ in 1:maxiter
 #         colors = randomcolorscheme(args...)
 #         filter(colors) && return colors
@@ -340,7 +340,7 @@ function window(k, h=1)
     w .= h .* (1 .- (abs.(w) ./ r) .^ 2)
 end
 function randommaskcolor(colors)
-    colors = parsecolor.(unique(colors))
+    colors = ascolor.(unique(colors))
     colors = HSL.(colors)
     colors = [(c.h, c.s, c.l) for c in colors]
     rl = 77 # 256*0.3
@@ -401,7 +401,7 @@ function randomlinecolor(colors)
     else
         linecolor = (rand(), rand(), rand(), min(1.0, 0.5 + rand() / 2))
     end
-    "#" * hex(parsecolor(linecolor))
+    "#" * hex(ascolor(linecolor))
 end
 randomoutline() = rand((0, 0, 0, rand(2:10)))
 function randomfonts(lang="")

src/rendering.jl

@@ -1,7 +1,7 @@
 module Render
 export rendertext, overlay!,
     shape, ellipse, box, squircle, star, ngon, bezistar, bezingon, ellipse_area, box_area, squircle_area,
-    star_area, ngon_area, GIF, generate, parsecolor, rendertextoutlines,
+    star_area, ngon_area, GIF, generate, ascolor, rendertextoutlines,
     colorschemes, torgba, imagemask, outline, pad, dilate!, imresize, recolor!, recolor
 export issvg, save, load, tobitmap, tosvg, SVG, svg_wrap, svg_add, svg_stack
 using Luxor
@@ -11,13 +11,13 @@ using FileIO
 using  ImageTransformations
 include("svg.jl")
 # because of float error, (randommask(color=Gray(0.3))|>tobitmap)[300,300]|>torgba != Gray(0.3)|>torgba
-parsecolor(c) = parsecolor(parse(Colorant, c))
-parsecolor(c::Colorant) = ARGB{Colors.N0f8}(c)
-parsecolor(c::ARGB{Colors.N0f8}) = c
-parsecolor(tp::Tuple) = ARGB{Colors.N0f8}(tp...)
-parsecolor(gray::Real) = ARGB{Colors.N0f8}(Gray(gray))
-parsecolor(sc::Symbol) = parsecolor.(colorschemes[sc].colors)
-parsecolor(sc::AbstractArray) = parsecolor.(sc)
+ascolor(c) = ascolor(parse(Colorant, c))
+ascolor(c::Colorant) = ARGB{Colors.N0f8}(c)
+ascolor(c::ARGB{Colors.N0f8}) = c
+ascolor(tp::Tuple) = ARGB{Colors.N0f8}(tp...)
+ascolor(gray::Real) = ARGB{Colors.N0f8}(Gray(gray))
+ascolor(sc::Symbol) = ascolor.(colorschemes[sc].colors)
+ascolor(sc::AbstractArray) = ascolor.(sc)
 
 Base.size(s::Drawing) = (s.height, s.width)
 issvg(d) = d isa SVG
@@ -130,7 +130,7 @@ function imresize(svg::SVG, sz...; ratio=1)
 end
 
 function drawtext(t, size, pos, angle=0, color="black", font="")
-    setcolor(parsecolor(color))
+    setcolor(ascolor(color))
     setfont(font, size)
     settext(t, Point(pos...), halign="center", valign="center"; angle=angle)
 end
@@ -146,7 +146,7 @@ function rendertext(str::AbstractString, size::Real;
         drawing = Drawing(l, l, :svg) # svg is slow
     end
     origin()
-    bgcolor = parsecolor(backgroundcolor)
+    bgcolor = ascolor(backgroundcolor)
     bgcolor = background(bgcolor)
 
     drawtext(str, size, pos, angle, color, font)
@@ -175,10 +175,10 @@ function rendertextoutlines(str::AbstractString, size::Real; color="black", bgco
     l = length(str)
     Drawing(ceil(Int, 2l * (size + 2linewidth) + 2), ceil(Int, 2 * (size + 2linewidth) + 2), :image)
     origin()
-    bgcolor = parsecolor(bgcolor)
+    bgcolor = ascolor(bgcolor)
     bgcolor = background(bgcolor)
     # bgcolor = Luxor.ARGB32(bgcolor...)
-    setcolor(parsecolor(color))
+    setcolor(ascolor(color))
     #     setfont(font, size)
     fontface(font)
     fontsize(size)
@@ -193,7 +193,7 @@ function rendertextoutlines(str::AbstractString, size::Real; color="black", bgco
 end
 
 function torgba(c)
-    c = Colors.RGBA{Colors.N0f8}(parsecolor(c))
+    c = Colors.RGBA{Colors.N0f8}(ascolor(c))
     rgba = (Colors.red(c), Colors.green(c), Colors.blue(c), Colors.alpha(c))
     reinterpret.(UInt8, rgba)
 end
@@ -219,7 +219,7 @@ function imagemask(img::AbstractMatrix, transparent=:auto)
     if transparent === nothing
         return trues(size(img))
     end
-    img .!= convert(eltype(img), parsecolor(transparent))
+    img .!= convert(eltype(img), ascolor(transparent))
 end
 imagemask(img::SVG, istransparent::Function) = imagemask(tobitmap(img), istransparent)
 imagemask(img::SVG, transparent::AbstractArray{Bool,2}) = .!transparent
@@ -281,22 +281,22 @@ function outline(img; transparent=:auto, color="black", linewidth=2, smoothness=
     r = 2 * linewidth * smoothness
     # @show r
     mask2 = dilate2(mask, max(linewidth, round(r)), smoothness=smoothness)
-    c = ARGB(parsecolor(color)) # https://github.com/JuliaGraphics/Colors.jl/issues/500
+    c = ARGB(ascolor(color)) # https://github.com/JuliaGraphics/Colors.jl/issues/500
     bg = convert.(eltype(img), coloralpha.(c, mask2))
     bg = overlay!(copy(img), bg)
     @views bg[mask] .= overlay.(bg[mask], img[mask])
     bg
 end
 
 function pad(img::AbstractMatrix, r=maximum(size(img)) ÷ 10; backgroundcolor=:auto)
-    color = convert(eltype(img), parsecolor(_backgroundcolor(img, backgroundcolor)))
+    color = convert(eltype(img), ascolor(_backgroundcolor(img, backgroundcolor)))
     r = ceil.(Int, r)
     bg = fill(color, size(img) .+ 2 .* r)
     overlay!(bg, img, reverse((0, 0) .+ r)...)
 end
 
 function pad(img::SVG, r=maximum(size(img)) ÷ 10; backgroundcolor=(0, 0, 0, 0))
-    color = parsecolor(backgroundcolor)
+    color = ascolor(backgroundcolor)
     sz = size(img) .+ 2 .* ceil.(Int, r)
     p = readsvg(string(img))
     m2 = Drawing(reverse(sz)..., :svg)
@@ -349,7 +349,7 @@ end
 
 function overlay(imgs, poss; backgroundcolor=(1, 1, 1, 0), size=size(imgs[1]))
     bg = Drawing(size..., :svg)
-    Luxor.background(parsecolor(backgroundcolor))
+    Luxor.background(ascolor(backgroundcolor))
     finish()
     bg = SVG(svgstring(), bg.height, bg.width)
     # (x,y)=(1,1)时左上角重合，此时Point(0,0)
@@ -358,11 +358,11 @@ function overlay(imgs, poss; backgroundcolor=(1, 1, 1, 0), size=size(imgs[1]))
     bg
 end
 function recolor!(img::AbstractArray, color)
-    c = parsecolor(color)
+    c = ascolor(color)
     img .= convert.(eltype(img), Colors.alphacolor.(c, Colors.alpha.(img)))
 end
 function recolor(img::AbstractArray, color)
-    c = parsecolor(color)
+    c = ascolor(color)
     convert.(eltype(img), Colors.alphacolor.(c, Colors.alpha.(img)))
 end
 
@@ -446,13 +446,13 @@ function shape(shape_, width, height, args...;
     kargs...)
     d = Drawing(ceil.(backgroundsize)..., :svg)
     origin()
-    background(parsecolor(backgroundcolor))
+    background(ascolor(backgroundcolor))
     if outline > 0
         setline(outline)
-        setcolor(parsecolor(linecolor))
+        setcolor(ascolor(linecolor))
         shape_(Point(0, 0), width, height, args...; action=:stroke, kargs...)
     end
-    setcolor(parsecolor(color))
+    setcolor(ascolor(color))
     shape_(Point(0, 0), width, height, args...; action=:fill, kargs...)
     finish()
     SVG(svgstring(), d.height, d.width)

src/strategy.jl

@@ -105,7 +105,7 @@ function prepareword(word, fontsize, color, angle; backgroundcolor=(0, 0, 0, 0),
 end
 
 wordmask(img, bgcolor, border) = dilate!(alpha.(img) .!= 0, border)
-# use `alpha` instead of `convert(eltype(img), parsecolor(bgcolor))`
+# use `alpha` instead of `convert(eltype(img), ascolor(bgcolor))`
 # https://github.com/JuliaGraphics/Luxor.jl/issues/107
 function ternary_wordmask(img, bgcolor, border)
     tmask = fill(Stuffing.EMPTY, size(img))

src/utils.jl

@@ -5,7 +5,7 @@ function imageof(layer::AbstractMatrix{UInt8})
 end
 function showmask!(img, mask; highlight=ARGB(1, 0, 0, 0.3))
     mask = .!mask
-    hl = convert(eltype(img), parsecolor(highlight))
+    hl = convert(eltype(img), ascolor(highlight))
     img[mask] .= Render.overlay.(img[mask], hl)
     img
 end

src/wc-class.jl

@@ -356,7 +356,7 @@ const _SET_DOC = "This function accepts three positional arguments: a wordcloud
 @doc _GET_DOC getfonts(wc::WC, w=:) = wc.params[:fonts][index(wc, w)]
 @doc _GET_DOC getwords(wc::WC, w=:) = wc.words[index(wc, w)]
 @doc _GET_DOC getweights(wc::WC, w=:) = wc.weights[index(wc, w)]
-@doc _SET_DOC setcolors!(wc::WC, w, c) = @view(wc.params[:colors][index(wc, w)]) .= parsecolor(c)
+@doc _SET_DOC setcolors!(wc::WC, w, c) = @view(wc.params[:colors][index(wc, w)]) .= ascolor(c)
 @doc _SET_DOC setangles!(wc::WC, w, a::Union{Number,AbstractVector{<:Number}}) = @view(wc.params[:angles][index(wc, w)]) .= a
 @doc _SET_DOC
 function setfonts!(wc::WC, w, v::Union{AbstractString,AbstractVector{<:AbstractString}})

src/wc-helper.jl

@@ -36,7 +36,7 @@ function loadmask(img::AbstractMatrix{<:TransparentRGB}, args...;
         img = imresize(img, args...; ratio=ratio .* vf)
         copied = true
     end
-    backgroundcolor ∉ DEFAULTSYMBOLS && (backgroundcolor = parsecolor(backgroundcolor))
+    backgroundcolor ∉ DEFAULTSYMBOLS && (backgroundcolor = ascolor(backgroundcolor))
     if padding != 0 # padding before cal imagemask
         bc = backgroundcolor in DEFAULTSYMBOLS ? :auto : backgroundcolor
         img = pad(img, padding, backgroundcolor=bc)
@@ -47,7 +47,7 @@ function loadmask(img::AbstractMatrix{<:TransparentRGB}, args...;
     if color ∉ DEFAULTSYMBOLS || backgroundcolor ∉ DEFAULTSYMBOLS
         copied || (img = copy(img))
         if color ∉ DEFAULTSYMBOLS
-            color = parsecolor(color)
+            color = ascolor(color)
             alpha(color) == 1 || @warn "the alpha channel is ignored"
             m = @view img[mask]
             Render.recolor!(m, color) # 保持透明度
@@ -137,10 +137,10 @@ function paint(wc::WC, args...; background=true, kargs...)
     if background == true
         bgcolor = getbackgroundcolor(wc)
         bgcolor in DEFAULTSYMBOLS && (bgcolor = (1,1,1,0))
-        background = fill(convert(eltype(wc.mask), parsecolor(bgcolor)), size(wc.mask))
+        background = fill(convert(eltype(wc.mask), ascolor(bgcolor)), size(wc.mask))
         overlay!(background, wc.mask)
     elseif background == false || background === nothing
-        background = fill(convert(eltype(wc.mask), parsecolor((1,1,1,0))), size(wc.mask))
+        background = fill(convert(eltype(wc.mask), ascolor((1,1,1,0))), size(wc.mask))
     else
         background = copy(background)
     end

test/runtests.jl

@@ -50,9 +50,9 @@ include("test_textprocessing.jl")
 
     ##############no mask file
     wc = wordcloud(["test"], [1], maskcolor="green", outline=5)
-    @test WordCloud.alpha(parsecolor(getbackgroundcolor(wc))) == 0
+    @test WordCloud.alpha(ascolor(getbackgroundcolor(wc))) == 0
     wc = wordcloud(["test"], [1], backgroundcolor="blue", outline=5)
-    @test parsecolor(getmaskcolor(wc)) == parsecolor("blue")
+    @test ascolor(getmaskcolor(wc)) == ascolor("blue")
     wc = wordcloud(["test"], [1], maskcolor="green")
     @test getparameter(wc, :outline) == 0
     wc = wordcloud(["test"], [1], backgroundcolor="blue")
@@ -84,8 +84,8 @@ include("test_textprocessing.jl")
     wc = wordcloud(["test"], [1], colors="#DE2910", mask=pngfile, backgroundcolor=0)
     @test getmaskcolor(wc) == getbackgroundcolor(wc)
     wc = wordcloud(["test"], [1], colors="#DE2910", mask=pngfile, maskcolor=1, backgroundcolor=0)
-    @test parsecolor(getmaskcolor(wc)) == parsecolor(1)
-    @test parsecolor(getbackgroundcolor(wc)) == parsecolor(0)
+    @test ascolor(getmaskcolor(wc)) == ascolor(1)
+    @test ascolor(getbackgroundcolor(wc)) == ascolor(0)
     wordcloud(["test"], [1], mask=pngfile, backgroundcolor=:maskcolor) # backgroundcolor=maskcolor=:default, didn't change anything
     wordcloud(["test"], [1], mask=pngfile, maskcolor="#faeef8", backgroundcolor=:maskcolor)
     wordcloud(["test"], [1], mask=pngfile, maskcolor="#faeef8", backgroundcolor=:maskcolor, outline=3)