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

Merge 8368f34d84729ee22381b86b05a9a059f6aadfcb into 1ee6affcb3990cdcfa1e489451bc57c3f33be015

Browse Source
This commit is contained in:
Huckleberry Febbo 2017-04-28 00:05:19 +00:00 committed by GitHub
commit 1d12a53185
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/animation.jl
View File

@ -80,7 +80,9 @@ function buildanimation(animdir::AbstractString, fn::AbstractString;
catch err catch err
warn("""Tried to create gif using convert (ImageMagick), but got error: $err warn("""Tried to create gif using convert (ImageMagick), but got error: $err
ImageMagick can be installed by executing `Pkg.add("ImageMagick")` ImageMagick needs to be installed in julia and on your machine:
1) in julia>> `Pkg.add("ImageMagick")`
2) on your machine (in terminal run): sudo apt install imagemagick
Will try ffmpeg, but it's lower quality...)""") Will try ffmpeg, but it's lower quality...)""")
# low quality # low quality

12
src/backends/pyplot.jl
View File

@ -85,17 +85,7 @@ function _initialize_backend(::PyPlotBackend)
const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections")) const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections"))
const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d")) const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d"))
end end
if is_linux()
@eval begin
# avoid Conda update that causes Segfault with qt >=4.8.6 on Ubuntu https://github.com/JuliaPy/PyPlot.jl/issues/234
import Conda
kw = Conda._installed_packages_dict()
if (!haskey(kw,"qt") || (qt_version=get(kw,"qt",0)[1]!=v"4.8.5"))
print("\n If the code has a Segmentation fault error switch to qt v4.8.5 by pasting the following code into julia: \n \n")
print(add_backend_string(PyPlotBackend()))
end
end
end
# we don't want every command to update the figure # we don't want every command to update the figure
PyPlot.ioff() PyPlot.ioff()
end end