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

gr: don't set GKS_WSTYPE for windows/use_default

Browse Source
This commit is contained in:
Thomas Breloff 2016-10-08 23:03:07 -04:00
parent 96821f6303
commit f290748c72
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/gr.jl
View File

@ -1040,7 +1040,7 @@ const _gr_wstype_default = @static if is_linux()
elseif is_apple() elseif is_apple()
"quartz" "quartz"
else else
"windows" "use_default"
end end
const _gr_wstype = Ref(get(ENV, "GKS_WSTYPE", _gr_wstype_default)) const _gr_wstype = Ref(get(ENV, "GKS_WSTYPE", _gr_wstype_default))
@ -1052,11 +1052,8 @@ for (mime, fmt) in _gr_mimeformats
filepath = tempname() * "." * $fmt filepath = tempname() * "." * $fmt
ENV["GKS_WSTYPE"] = $fmt ENV["GKS_WSTYPE"] = $fmt
ENV["GKS_FILEPATH"] = filepath ENV["GKS_FILEPATH"] = filepath
# withenv("GKS_WSTYPE" => $fmt, # $fmt == "png" ? "cairopng" : $fmt,
# "GKS_FILEPATH" => filepath) do
gr_display(plt) gr_display(plt)
GR.emergencyclosegks() GR.emergencyclosegks()
# end
write(io, readstring(filepath)) write(io, readstring(filepath))
rm(filepath) rm(filepath)
end end
@ -1068,20 +1065,16 @@ function _display(plt::Plot{GRBackend})
filepath = tempname() * ".pdf" filepath = tempname() * ".pdf"
ENV["GKS_WSTYPE"] = "pdf" ENV["GKS_WSTYPE"] = "pdf"
ENV["GKS_FILEPATH"] = filepath ENV["GKS_FILEPATH"] = filepath
# withenv("GKS_WSTYPE" => "pdf",
# "GKS_FILEPATH" => filepath) do
gr_display(plt) gr_display(plt)
GR.emergencyclosegks() GR.emergencyclosegks()
# end
content = string("\033]1337;File=inline=1;preserveAspectRatio=0:", base64encode(open(readbytes, filepath)), "\a") content = string("\033]1337;File=inline=1;preserveAspectRatio=0:", base64encode(open(readbytes, filepath)), "\a")
println(content) println(content)
rm(filepath) rm(filepath)
else else
ENV["GKS_DOUBLE_BUF"] = true ENV["GKS_DOUBLE_BUF"] = true
if _gr_wstype[] != "use_default"
ENV["GKS_WSTYPE"] = _gr_wstype[] ENV["GKS_WSTYPE"] = _gr_wstype[]
# withenv("GKS_WSTYPE" => get(ENV, "GKS_WSTYPE", _gr_wstype_default), end
# "GKS_DOUBLE_BUF" => get(ENV ,"GKS_DOUBLE_BUF", "true")) do
gr_display(plt) gr_display(plt)
# end
end end
end end