Fixed initialization in Juno

This commit is contained in:
Giorgio Calderone 2020-04-25 19:28:57 +02:00
parent 2fb581b3a3
commit d74715f156
3 changed files with 20 additions and 11 deletions

View File

@ -1,3 +1,11 @@
# Version 1.3.0 (not yet released)
mime
gpviewer
term_svg, term_png
contourlines(x::AbstractVector{Float64}, y::AbstractVector{Float64}, z::AbstractMatrix{Float64},
save(mime)
# Version 1.2.0 (released on: Apr. 20, 2020) # Version 1.2.0 (released on: Apr. 20, 2020)
- New features: - New features:

View File

@ -3,7 +3,7 @@ empty!(Gnuplot.options.mime)
makedocs(sitename="Gnuplot.jl", makedocs(sitename="Gnuplot.jl",
authors = "Giorgio Calderone", authors = "Giorgio Calderone",
#format = Documenter.HTML(prettyurls = false), # uncomment for local use, comment for deployment format = Documenter.HTML(prettyurls = false), # uncomment for local use, comment for deployment
modules=[Gnuplot], modules=[Gnuplot],
pages = [ pages = [
"Home" => "index.md", "Home" => "index.md",

View File

@ -230,17 +230,19 @@ end
# ╭───────────────────────────────────────────────────────────────────╮ # ╭───────────────────────────────────────────────────────────────────╮
# │ GLOBAL VARIABLES # │ GLOBAL VARIABLES AND MODULE INITIALIZATION
# ╰───────────────────────────────────────────────────────────────────╯ # ╰───────────────────────────────────────────────────────────────────╯
const sessions = OrderedDict{Symbol, Session}() const sessions = OrderedDict{Symbol, Session}()
const options = Options() const options = Options()
# Trick to check whether we are running in a IJulia or Juno function __init__()
# session. Copied from Gaston.jl. # Check whether we are running in a IJulia or Juno session.
# (copied from Gaston.jl).
options.gpviewer = !( options.gpviewer = !(
((isdefined(Main, :IJulia) && Main.IJulia.inited) || ((isdefined(Main, :IJulia) && Main.IJulia.inited) ||
(isdefined(Main, :Juno) && Main.Juno.isactive())) (isdefined(Main, :Juno) && Main.Juno.isactive()))
) )
end
# ╭───────────────────────────────────────────────────────────────────╮ # ╭───────────────────────────────────────────────────────────────────╮
@ -1307,8 +1309,7 @@ function driver(_args...; is3d=false)
if options.gpviewer && doDump if options.gpviewer && doDump
execall(gp) execall(gp)
end end
out = SessionID(gp.sid, doDump) return SessionID(gp.sid, doDump)
return out
end end
@ -1320,7 +1321,7 @@ end
Return the **Gnuplot.jl** package version. Return the **Gnuplot.jl** package version.
""" """
version() = v"1.2.1-dev" version() = v"1.3.0-dev"
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
""" """