Skip to content

Commit e965fab

Browse files
committed
refactor(wordcloud): rename arg
1 parent a6d0317 commit e965fab

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "WordCloud"
22
uuid = "6385f0a0-cb03-45b6-9089-4e0acc74b26b"
33
authors = ["guoyongzhi <guo-yong-zhi@outlook.com>"]
4-
version = "1.2.0"
4+
version = "1.2.1"
55

66
[deps]
77
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"

src/wc-class.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function wordcloud(words::AbstractVector{<:AbstractString}, weights::AbstractVec
150150
end
151151
function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto, language=:auto,
152152
mask=:auto, svgmask=nothing, editmask=true, transparent=:auto,
153-
masksize=:auto, maskcolor=:default, keepmaskarea=:auto, avgfontsize=12,
153+
masksize=:auto, maskcolor=:default, preservevolume=:auto, avgfontsize=12,
154154
backgroundcolor=:default, padding=:default, outline=:default, linecolor=:auto,
155155
params=Dict{Symbol,Any}(), kargs...)
156156
merge!(params, kargs)
@@ -178,8 +178,8 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
178178
maskcolor = backgroundcolor
179179
end
180180
end
181-
if keepmaskarea in DEFAULTSYMBOLS
182-
keepmaskarea = masksize in DEFAULTSYMBOLS
181+
if preservevolume in DEFAULTSYMBOLS
182+
preservevolume = masksize in DEFAULTSYMBOLS
183183
end
184184
masksize in DEFAULTSYMBOLS && (masksize = volumeproposal(words, weights, avgfontsize))
185185
if backgroundcolor in DEFAULTSYMBOLS
@@ -203,7 +203,7 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
203203
end
204204
padding in DEFAULTSYMBOLS && (padding = round(Int, maximum(masksize) ÷ 10))
205205
mask, maskkw = randommask(masksize; maskshape=mask, color=maskcolor, padding=padding,
206-
preservevolume=keepmaskarea, returnkwargs=true, kg..., kargs...)
206+
preservevolume=preservevolume, returnkwargs=true, kg..., kargs...)
207207
merge!(params, maskkw)
208208
transparent = c -> c != torgba(maskcolor)
209209
elseif editmask
@@ -214,8 +214,8 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
214214
else
215215
ms = masksize
216216
end
217-
if keepmaskarea in DEFAULTSYMBOLS
218-
keepmaskarea = masksize == :auto
217+
if preservevolume in DEFAULTSYMBOLS
218+
preservevolume = masksize == :auto
219219
end
220220
if backgroundcolor == :auto
221221
if maskcolor == :default
@@ -249,10 +249,10 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
249249
padding in DEFAULTSYMBOLS && (padding = outline)
250250
if svgmask !== nothing
251251
svgmask = loadmask(svgmask, ms...; color=maskcolor, transparent=transparent, backgroundcolor=bc,
252-
outline=outline, linecolor=linecolor, padding=padding, preservevolume=keepmaskarea, kargs...)
252+
outline=outline, linecolor=linecolor, padding=padding, preservevolume=preservevolume, kargs...)
253253
end
254254
mask, binarymask = loadmask(mask, ms...; color=maskcolor, transparent=transparent, backgroundcolor=bc,
255-
outline=outline, linecolor=linecolor, padding=padding, return_bitmask=true, preservevolume=keepmaskarea, kargs...)
255+
outline=outline, linecolor=linecolor, padding=padding, return_bitmask=true, preservevolume=preservevolume, kargs...)
256256
binarymask === nothing || (transparent = .!binarymask)
257257
else
258258
mask = loadmask(mask)

0 commit comments

Comments
 (0)