mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 1b5c258e00f9bdf4a167eb2b22376ad79a8660df into 5b0ba79a35f45098071ce421be4c481ec946a5c7

Browse Source
This commit is contained in:
Michael Krabbe Borregaard 2018-05-04 08:54:50 +00:00 committed by GitHub
commit 2d65a67915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components.jl
View File

@ -443,7 +443,7 @@ mutable struct SeriesAnnotations
end end
function series_annotations(strs::AbstractVector, args...) function series_annotations(strs::AbstractVector, args...)
fnt = font() fnt = font()
shp = Nullable{Any}() shp = Union{Any, Nothing}()
scalefactor = (1,1) scalefactor = (1,1)
for arg in args for arg in args
if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape) if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape)

4
src/plot.jl
View File

@ -1,8 +1,8 @@
mutable struct CurrentPlot mutable struct CurrentPlot
nullableplot::Nullable{AbstractPlot} nullableplot::Union{AbstractPlot, Nothing}
end end
const CURRENT_PLOT = CurrentPlot(Nullable{AbstractPlot}()) const CURRENT_PLOT = CurrentPlot(Union{AbstractPlot, Nothing}())
isplotnull() = isnull(CURRENT_PLOT.nullableplot) isplotnull() = isnull(CURRENT_PLOT.nullableplot)