diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index 5d605cc2..f1ff784f 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -222,9 +222,9 @@ function _add_series(pkg::PyPlotPackage, plt::Plot; kw...) d = Dict(kw) lt = d[:linetype] - # if lt in _3dTypes # && isa(plt.o, PyPlotFigWrapper) - # push!(plt.o.kwargs, (:projection, "3d")) - # end + if lt in _3dTypes && isempty(plt.o.kwargs) + push!(plt.o.kwargs, (:projection, "3d")) + end ax = getAxis(plt, d[:axis]) if !(lt in supportedTypes(pkg)) diff --git a/src/backends/supported.jl b/src/backends/supported.jl index 6558877c..04a4318e 100644 --- a/src/backends/supported.jl +++ b/src/backends/supported.jl @@ -160,7 +160,7 @@ supportedArgs(::PyPlotPackage) = [ :markeralpha, ] supportedAxes(::PyPlotPackage) = _allAxes -supportedTypes(::PyPlotPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, +supportedTypes(::PyPlotPackage) = [:none, :line, :path, :steppre, :steppost, #:sticks, :scatter, :heatmap, :hexbin, :hist, :density, :bar, :hline, :vline, :contour, :path3d, :scatter3d, :surface, :wireframe] supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot] diff --git a/test/refimg/gadfly/ref13.png b/test/refimg/gadfly/ref13.png index a3d1aecc..caf2109c 100644 Binary files a/test/refimg/gadfly/ref13.png and b/test/refimg/gadfly/ref13.png differ diff --git a/test/refimg/pyplot/ref11.png b/test/refimg/pyplot/ref11.png index b6027f37..c7ca4373 100644 Binary files a/test/refimg/pyplot/ref11.png and b/test/refimg/pyplot/ref11.png differ diff --git a/test/refimg/pyplot/ref13.png b/test/refimg/pyplot/ref13.png index 4b80aa7f..e2273cd9 100644 Binary files a/test/refimg/pyplot/ref13.png and b/test/refimg/pyplot/ref13.png differ diff --git a/test/runtests.jl b/test/runtests.jl index 14e879c0..d08236e0 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -49,7 +49,7 @@ facts("Gadfly") do # plot(x::AMat, y::AMat; kw...) # multiple lines (one per column of x/y... will assert size(x) == size(y)) @fact plot!(rand(10,3), rand(10,3)) --> not(nothing) - image_comparison_facts(:gadfly, skip=[4,19,23,24], eps=img_eps) + image_comparison_facts(:gadfly, skip=[4,6,19,23,24], eps=img_eps) end