diff --git a/img/supported/Plots.supportGraphMarkers.png b/img/supported/Plots.supportGraphMarkers.png index 6332c956..85573a78 100644 Binary files a/img/supported/Plots.supportGraphMarkers.png and b/img/supported/Plots.supportGraphMarkers.png differ diff --git a/img/supported/Plots.supportGraphStyles.png b/img/supported/Plots.supportGraphStyles.png index 1439c060..f15bdbb8 100644 Binary files a/img/supported/Plots.supportGraphStyles.png and b/img/supported/Plots.supportGraphStyles.png differ diff --git a/src/backends/winston.jl b/src/backends/winston.jl index 8b86e85f..a1e48e41 100644 --- a/src/backends/winston.jl +++ b/src/backends/winston.jl @@ -74,8 +74,8 @@ supportedArgs(::WinstonPackage) = [ ] supportedAxes(::WinstonPackage) = [:auto, :left] supportedTypes(::WinstonPackage) = [:none, :line, :path, :sticks, :scatter, :hist, :bar] -supportedStyles(::WinstonPackage) = intersect(_allStyles, collect(keys(winston_linestyle))) -supportedMarkers(::WinstonPackage) = intersect(_allMarkers, collect(keys(winston_marker))) +supportedStyles(::WinstonPackage) = [:auto, :solid, :dash, :dot, :dashdot] # intersect(_allStyles, collect(keys(winston_linestyle))) +supportedMarkers(::WinstonPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1] # intersect(_allMarkers, collect(keys(winston_marker))) subplotSupported(::WinstonPackage) = false diff --git a/src/utils.jl b/src/utils.jl index 9a6b8e23..cb1652ce 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -212,19 +212,28 @@ extendSeriesData(v::AVec, z::AVec) = (append!(v, z); v) # --------------------------------------------------------------- function supportGraph(allvals, func) - vals = reverse(sort(allvals)) - x = ASCIIString[] - y = ASCIIString[] - for val in vals - for b in sort(backends()) - supported = func(Plots.backendInstance(b)) - if val in supported - push!(x, string(b)) - push!(y, string(val)) - end - end - end - scatter(x,y, m=:rect, ms=10, size=(300,100+18*length(vals)), leg=false) + vals = reverse(sort(allvals)) + bs = sort(backends()) + x = ASCIIString[] + y = ASCIIString[] + for val in vals + for b in bs + supported = func(Plots.backendInstance(b)) + if val in supported + push!(x, string(b)) + push!(y, string(val)) + end + end + end + n = length(vals) + + scatter(x,y, + m=:rect, + ms=10, + size=(300,100+18*n), + # xticks=(collect(1:length(bs)), bs), + leg=false + ) end supportGraphArgs() = supportGraph(_allArgs, supportedArgs)