Refactored driver(); changed syntax for named datasets
This commit is contained in:
Giorgio Calderone
parent
9a98fbe19c
commit
1b8006b710
173
src/Gnuplot.jl
173
src/Gnuplot.jl
@ -467,18 +467,18 @@ end
|
|||||||
|
|
||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
function setmulti(gp::DrySession, mid::Int)
|
function setmulti(gp::DrySession, mid::Int)
|
||||||
@assert mid >= 0 "Multiplot ID must be a >= 0"
|
@assert mid >= 1 "Multiplot ID must be a >= 1"
|
||||||
for i in length(gp.plots)+1:mid
|
while length(gp.plots) < mid
|
||||||
push!(gp.plots, SinglePlot())
|
push!(gp.plots, SinglePlot())
|
||||||
end
|
end
|
||||||
(mid > 0) && (gp.curmid = mid)
|
gp.curmid = mid
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
function newdataset(gp::DrySession, accum::Vector{String}; name="")
|
function newdataset(gp::DrySession, accum::Vector{String}; name="")
|
||||||
(name == "") && (name = string("data", length(gp.datas)))
|
(name == "") && (name = string("\$data", length(gp.datas)))
|
||||||
name = "\$$name"
|
#name = "\$$name"
|
||||||
d = DataSet(name, accum)
|
d = DataSet(name, accum)
|
||||||
push!(gp.datas, d)
|
push!(gp.datas, d)
|
||||||
write(gp, d) # Send now to gnuplot process
|
write(gp, d) # Send now to gnuplot process
|
||||||
@ -488,24 +488,22 @@ newdataset(gp::DrySession, args...; name="") = newdataset(gp, data2string(args..
|
|||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
function newcmd(gp::DrySession, v::String; mid::Int=0)
|
function newcmd(gp::DrySession, v::String)
|
||||||
setmulti(gp, mid)
|
|
||||||
(v != "") && (push!(gp.plots[gp.curmid].cmds, v))
|
(v != "") && (push!(gp.plots[gp.curmid].cmds, v))
|
||||||
(length(gp.plots) == 1) && (exec(gp, v)) # execute now to check against errors
|
(length(gp.plots) == 1) && (exec(gp, v)) # execute now to check against errors
|
||||||
return nothing
|
return nothing
|
||||||
end
|
end
|
||||||
|
|
||||||
function newcmd(gp::DrySession; mid::Int=0, args...)
|
function newcmd(gp::DrySession; args...)
|
||||||
for v in parseKeywords(;args...)
|
for v in parseKeywords(;args...)
|
||||||
newcmd(gp, v, mid=mid)
|
newcmd(gp, v)
|
||||||
end
|
end
|
||||||
return nothing
|
return nothing
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
function newplot(gp::DrySession, name, opt=""; mid=0)
|
function newplot(gp::DrySession, name, opt="")
|
||||||
setmulti(gp, mid)
|
|
||||||
push!(gp.plots[gp.curmid].elems, "$name $opt")
|
push!(gp.plots[gp.curmid].elems, "$name $opt")
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -534,6 +532,7 @@ end
|
|||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
execall(gp::DrySession; term::AbstractString="", output::AbstractString="") = nothing
|
execall(gp::DrySession; term::AbstractString="", output::AbstractString="") = nothing
|
||||||
function execall(gp::GPSession; term::AbstractString="", output::AbstractString="")
|
function execall(gp::GPSession; term::AbstractString="", output::AbstractString="")
|
||||||
|
exec(gp, "reset")
|
||||||
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]
|
||||||
@ -599,35 +598,6 @@ end
|
|||||||
|
|
||||||
# ---------------------------------------------------------------------
|
# ---------------------------------------------------------------------
|
||||||
function driver(args...; flag3d=false)
|
function driver(args...; flag3d=false)
|
||||||
if length(args) == 0
|
|
||||||
gp = getsession()
|
|
||||||
execall(gp)
|
|
||||||
return nothing
|
|
||||||
end
|
|
||||||
|
|
||||||
data = Vector{Any}()
|
|
||||||
dataname = ""
|
|
||||||
dataplot = nothing
|
|
||||||
|
|
||||||
function dataCompleted()
|
|
||||||
if length(data) > 0
|
|
||||||
AllArraysAreNotEmpty = true
|
|
||||||
for i in 1:length(data)
|
|
||||||
if (typeof(data[i]) <: AbstractArray) && (length(data[i]) == 0)
|
|
||||||
#@warn "Input array is empty"
|
|
||||||
AllArraysAreNotEmpty = false
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if AllArraysAreNotEmpty
|
|
||||||
last = newdataset(gp, data...; name=dataname)
|
|
||||||
(dataplot != nothing) && (newplot(gp, last, dataplot))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
data = Vector{Any}()
|
|
||||||
dataname = ""
|
|
||||||
dataplot = nothing
|
|
||||||
end
|
|
||||||
function isPlotCmd(s::String)
|
function isPlotCmd(s::String)
|
||||||
(length(s) >= 2) && (s[1:2] == "p " ) && (return (true, false, strip(s[2:end])))
|
(length(s) >= 2) && (s[1:2] == "p " ) && (return (true, false, strip(s[2:end])))
|
||||||
(length(s) >= 3) && (s[1:3] == "pl " ) && (return (true, false, strip(s[3:end])))
|
(length(s) >= 3) && (s[1:3] == "pl " ) && (return (true, false, strip(s[3:end])))
|
||||||
@ -641,73 +611,116 @@ function driver(args...; flag3d=false)
|
|||||||
return (false, false, "")
|
return (false, false, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if length(args) == 0
|
||||||
|
gp = getsession()
|
||||||
|
execall(gp)
|
||||||
|
return nothing
|
||||||
|
end
|
||||||
|
|
||||||
|
# First pass: check for ":-" and session names
|
||||||
gp = nothing
|
gp = nothing
|
||||||
doDump = true
|
doDump = true
|
||||||
doReset = true
|
doReset = true
|
||||||
|
|
||||||
for loop in 1:2
|
|
||||||
if loop == 2
|
|
||||||
(gp == nothing) && (gp = getsession())
|
|
||||||
doReset && reset(gp)
|
|
||||||
gp.plots[gp.curmid].flag3d = flag3d
|
|
||||||
end
|
|
||||||
|
|
||||||
for iarg in 1:length(args)
|
for iarg in 1:length(args)
|
||||||
arg = args[iarg]
|
arg = args[iarg]
|
||||||
|
|
||||||
if typeof(arg) == Symbol
|
if typeof(arg) == Symbol
|
||||||
if arg == :-
|
if arg == :-
|
||||||
(loop == 1) && (iarg < length(args)) && (doReset = false)
|
if iarg == 1
|
||||||
(loop == 1) && (iarg > 1 ) && (doDump = false)
|
doReset = false
|
||||||
|
elseif iarg == length(args)
|
||||||
|
doDump = false
|
||||||
else
|
else
|
||||||
(loop == 1) && (gp = getsession(arg))
|
@warn ":- at position $iarg in argument list has no meaning."
|
||||||
end
|
|
||||||
elseif isa(arg, Tuple) && length(arg) == 2 && isa(arg[1], Symbol)
|
|
||||||
if arg[1] == :term
|
|
||||||
if loop == 1
|
|
||||||
if typeof(arg[2]) == String
|
|
||||||
term = (deepcopy(arg[2]), "")
|
|
||||||
elseif length(arg[2]) == 2
|
|
||||||
term = deepcopy(arg[2])
|
|
||||||
else
|
|
||||||
error("The term tuple must contain at most two strings")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
(loop == 2) && newcmd(gp; [arg]...) # A cmd keyword
|
@assert isnothing(gp) "Only one session at a time can be addressed"
|
||||||
|
gp = getsession(arg)
|
||||||
end
|
end
|
||||||
elseif isa(arg, Int)
|
end
|
||||||
(loop == 2) && (@assert arg > 0)
|
end
|
||||||
(loop == 2) && (dataplot = ""; dataCompleted())
|
(gp == nothing) && (gp = getsession())
|
||||||
(loop == 2) && setmulti(gp, arg)
|
doReset && reset(gp)
|
||||||
(loop == 2) && (gp.plots[gp.curmid].flag3d = flag3d)
|
|
||||||
|
dataset = Vector{Any}()
|
||||||
|
setname = ""
|
||||||
|
plotspec = nothing
|
||||||
|
|
||||||
|
function dataset_completed()
|
||||||
|
if length(dataset) > 0
|
||||||
|
AllArraysAreNotEmpty = true
|
||||||
|
for i in 1:length(dataset)
|
||||||
|
if (typeof(dataset[i]) <: AbstractArray) && (length(dataset[i]) == 0)
|
||||||
|
AllArraysAreNotEmpty = false
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if AllArraysAreNotEmpty
|
||||||
|
name = newdataset(gp, dataset...; name=setname)
|
||||||
|
if !isnothing(plotspec)
|
||||||
|
newplot(gp, name, plotspec)
|
||||||
|
gp.plots[gp.curmid].flag3d = flag3d
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
dataset = Vector{Any}()
|
||||||
|
setname = ""
|
||||||
|
plotspec = nothing
|
||||||
|
end
|
||||||
|
|
||||||
|
# Second pass
|
||||||
|
for iarg in 1:length(args)
|
||||||
|
arg = args[iarg]
|
||||||
|
isa(arg, Symbol) && continue # already handled
|
||||||
|
|
||||||
|
if isa(arg, Int)
|
||||||
|
# Change current multiplot index
|
||||||
|
@assert arg > 0
|
||||||
|
#@info "Multiplot ID" iarg typeof(arg) arg
|
||||||
|
plotspec = "" # use an empty plotspec for pending dataset
|
||||||
|
dataset_completed()
|
||||||
|
setmulti(gp, arg)
|
||||||
|
gp.plots[gp.curmid].flag3d = flag3d
|
||||||
elseif isa(arg, String)
|
elseif isa(arg, String)
|
||||||
# Either a dataname, a plot or a command
|
# Either a plotspec or a command
|
||||||
if loop == 2
|
arg = string(strip(arg))
|
||||||
if isa(arg, String) && (length(arg) > 1) && (arg[1] == '$')
|
if length(dataset) > 0
|
||||||
dataname = arg[2:end]
|
#@info "Plot spec." iarg typeof(arg) arg
|
||||||
dataCompleted()
|
plotspec = arg
|
||||||
elseif length(data) > 0
|
dataset_completed()
|
||||||
dataplot = arg
|
|
||||||
dataCompleted()
|
|
||||||
else
|
else
|
||||||
(isPlot, is3d, cmd) = isPlotCmd(arg)
|
(isPlot, is3d, cmd) = isPlotCmd(arg)
|
||||||
if isPlot
|
if isPlot
|
||||||
|
#@info "Plot command" iarg typeof(arg) arg
|
||||||
gp.plots[gp.curmid].flag3d = is3d
|
gp.plots[gp.curmid].flag3d = is3d
|
||||||
newplot(gp, cmd)
|
newplot(gp, cmd)
|
||||||
else
|
else
|
||||||
|
#@info "Command (string)" iarg typeof(arg) arg
|
||||||
newcmd(gp, arg)
|
newcmd(gp, arg)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
elseif isa(arg, Tuple) && length(arg) == 2 && isa(arg[1], Symbol)
|
||||||
|
#@info "Command (tuple)" iarg typeof(arg) arg
|
||||||
|
newcmd(gp; [arg]...)
|
||||||
|
elseif isa(arg, Pair)
|
||||||
|
# A named dataset
|
||||||
|
#@info "Named dataset" iarg typeof(arg) arg
|
||||||
|
@assert typeof(arg[1]) == String
|
||||||
|
@assert arg[1][1] == '$'
|
||||||
|
setname = arg[1]
|
||||||
|
for d in arg[2]
|
||||||
|
push!(dataset, d)
|
||||||
end
|
end
|
||||||
|
dataset_completed()
|
||||||
else
|
else
|
||||||
(loop == 2) && push!(data, arg) # a data set
|
# A dataset
|
||||||
end
|
#@info "Dataset element" iarg typeof(arg) arg
|
||||||
|
push!(dataset, arg)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
dataplot = ""
|
plotspec = ""
|
||||||
dataCompleted()
|
dataset_completed()
|
||||||
(doDump) && (execall(gp))
|
(doDump) && (execall(gp))
|
||||||
|
|
||||||
return nothing
|
return nothing
|
||||||
|
|||||||
@ -136,7 +136,7 @@ h = hist(noise, nbins=10)
|
|||||||
@gp x y "w l"
|
@gp x y "w l"
|
||||||
|
|
||||||
name = "\$MyDataSet1"
|
name = "\$MyDataSet1"
|
||||||
@gp x y name "plot $name w l" "pl $name u 1:(2*\$2) w l"
|
@gp name=>(x, y) "plot $name w l" "pl $name u 1:(2*\$2) w l"
|
||||||
|
|
||||||
@gsp randn(Float64, 30, 50)
|
@gsp randn(Float64, 30, 50)
|
||||||
@gp 1:30 1:50 randn(Float64, 30, 50) "w image"
|
@gp 1:30 1:50 randn(Float64, 30, 50) "w image"
|
||||||
@ -148,7 +148,7 @@ name = "\$MyDataSet1"
|
|||||||
x, y+noise, e, "w errorbars t 'Data'")
|
x, y+noise, e, "w errorbars t 'Data'")
|
||||||
|
|
||||||
@gp "f(x) = a * sin(b + c*x); a = 1; b = 1; c = 1;" :-
|
@gp "f(x) = a * sin(b + c*x); a = 1; b = 1; c = 1;" :-
|
||||||
@gp :- x y+noise e name :-
|
@gp :- name=>(x, y+noise, e) :-
|
||||||
@gp :- "fit f(x) $name u 1:2:3 via a, b, c;" :-
|
@gp :- "fit f(x) $name u 1:2:3 via a, b, c;" :-
|
||||||
@gp :- "set multiplot layout 2,1" :-
|
@gp :- "set multiplot layout 2,1" :-
|
||||||
@gp :- "plot $name w points" ylab="Data and model" :-
|
@gp :- "plot $name w points" ylab="Data and model" :-
|
||||||
@ -166,7 +166,7 @@ c = Meta.parse(Gnuplot.exec("print c"))
|
|||||||
@gp :- :dry "a = $a; b = $b; c = $c" :-
|
@gp :- :dry "a = $a; b = $b; c = $c" :-
|
||||||
@gp :- :dry "set multiplot layout 2,1" ylab="Data and model" :-
|
@gp :- :dry "set multiplot layout 2,1" ylab="Data and model" :-
|
||||||
name = "\$MyDataSet1"
|
name = "\$MyDataSet1"
|
||||||
@gp :- :dry x y+noise e name :-
|
@gp :- :dry name=>(x, y+noise, e,) :-
|
||||||
@gp :- :dry "plot $name w points" :-
|
@gp :- :dry "plot $name w points" :-
|
||||||
@gp :- :dry "plot $name u 1:(f(\$1)) w lines" :-
|
@gp :- :dry "plot $name u 1:(f(\$1)) w lines" :-
|
||||||
@gp :- :dry 2 xlab="X label" ylab="Residuals" :-
|
@gp :- :dry 2 xlab="X label" ylab="Residuals" :-
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user