Merge pull request #26 from lyon-fnal/master
Fix the string indexing error and problems with multiplot on JupyterLab
This commit is contained in:
commit
1877deef7f
@ -911,6 +911,7 @@ function execall(gp::GPSession; term::AbstractString="", output::AbstractString=
|
|||||||
if term != ""
|
if term != ""
|
||||||
former_term = writeread(gp, "print GPVAL_TERM")[1]
|
former_term = writeread(gp, "print GPVAL_TERM")[1]
|
||||||
former_opts = writeread(gp, "print GPVAL_TERMOPTIONS")[1]
|
former_opts = writeread(gp, "print GPVAL_TERMOPTIONS")[1]
|
||||||
|
gpexec(gp, "unset multiplot")
|
||||||
gpexec(gp, "set term $term")
|
gpexec(gp, "set term $term")
|
||||||
end
|
end
|
||||||
(output != "") && gpexec(gp, "set output '$output'")
|
(output != "") && gpexec(gp, "set output '$output'")
|
||||||
@ -2254,7 +2255,7 @@ function gpvars(sid::Symbol)
|
|||||||
if length(s) == 2
|
if length(s) == 2
|
||||||
key = Symbol(s[1])
|
key = Symbol(s[1])
|
||||||
if s[2][1] == '"'
|
if s[2][1] == '"'
|
||||||
out[key] = s[2][2:end-1]
|
out[key] = s[2][2:prevind(s[2], end, 1)]
|
||||||
else
|
else
|
||||||
try
|
try
|
||||||
out[key] = Meta.parse(s[2])
|
out[key] = Meta.parse(s[2])
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user