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

fixes

Browse Source
This commit is contained in:
Thomas Breloff 2015-10-15 01:34:06 -04:00
parent 39318e5e61
commit eab46ba9c4
5 changed files with 358 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
examples/meetup/slides_20151028.ipynb
View File

File diff suppressed because one or more lines are too long

2
src/Plots.jl
View File

@ -257,7 +257,7 @@ end
function __init__() function __init__()
global const CURRENT_BACKEND = pickDefaultBackend() global const CURRENT_BACKEND = pickDefaultBackend()
# global CURRENT_BACKEND # global CURRENT_BACKEND
println("[Plots.jl] Default backend: ", CURRENT_BACKEND.sym) # println("[Plots.jl] Default backend: ", CURRENT_BACKEND.sym)
# # auto init dataframes if the import statement doesn't error out # # auto init dataframes if the import statement doesn't error out
# try # try

4
src/args.jl
View File

@ -404,6 +404,8 @@ function processMarkerArg(d::Dict, arg)
# markershape # markershape
if trueOrAllTrue(a -> get(_markerAliases, a, a) in _allMarkers, arg) if trueOrAllTrue(a -> get(_markerAliases, a, a) in _allMarkers, arg)
d[:markershape] = arg d[:markershape] = arg
elseif trueOrAllTrue(a -> isa(a, Shape), arg)
d[:markershape] = arg
# markersize # markersize
elseif trueOrAllTrue(a -> typeof(a) <: Real, arg) elseif trueOrAllTrue(a -> typeof(a) <: Real, arg)
@ -530,7 +532,7 @@ function warnOnUnsupported(pkg::PlottingPackage, d::Dict)
|| warn("linestyle $(d[:linestyle]) is unsupported with $pkg. Choose from: $(supportedStyles(pkg))")) || warn("linestyle $(d[:linestyle]) is unsupported with $pkg. Choose from: $(supportedStyles(pkg))"))
(d[:markershape] == :none (d[:markershape] == :none
|| d[:markershape] in supportedMarkers(pkg) || d[:markershape] in supportedMarkers(pkg)
|| typeof(d[:markershape]) in supportedMarkers(pkg) || (Shape in supportedMarkers(pkg) && typeof(d[:markershape]) <: Shape)
|| warn("markershape $(d[:markershape]) is unsupported with $pkg. Choose from: $(supportedMarkers(pkg))")) || warn("markershape $(d[:markershape]) is unsupported with $pkg. Choose from: $(supportedMarkers(pkg))"))
end end

2
src/backends/gadfly.jl
View File

@ -61,7 +61,7 @@ supportedAxes(::GadflyPackage) = [:auto, :left]
supportedTypes(::GadflyPackage) = [:none, :line, :path, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc] supportedTypes(::GadflyPackage) = [:none, :line, :path, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc]
supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot] supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
# supportedMarkers(::GadflyPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon, Shape] # supportedMarkers(::GadflyPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon, Shape]
supportedMarkers(::GadflyPackage) = _allMarkers supportedMarkers(::GadflyPackage) = vcat(_allMarkers, Shape)
supportedScales(::GadflyPackage) = [:identity, :log, :log2, :log10, :asinh, :sqrt] supportedScales(::GadflyPackage) = [:identity, :log, :log2, :log10, :asinh, :sqrt]

2
src/plotter.jl
View File

@ -210,7 +210,7 @@ function backend(modname)
# update the symbol # update the symbol
CURRENT_BACKEND.sym = modname CURRENT_BACKEND.sym = modname
println("[Plots.jl] Switched to backend: ", modname) # println("[Plots.jl] Switched to backend: ", modname)
# return the package # return the package
CURRENT_BACKEND.pkg CURRENT_BACKEND.pkg