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

Minor changes

Browse Source
This commit is contained in:
Giorgio Calderone 2020-03-29 13:27:31 +02:00
parent 91294aa030
commit 0b0ed1f803
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Gnuplot.jl
View File

@ -12,7 +12,8 @@ export @gp, @gsp, save, linetypes, palette, contourlines, hist, terminal, termin
# ╰───────────────────────────────────────────────────────────────────╯ # ╰───────────────────────────────────────────────────────────────────╯
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
mutable struct DataSet mutable struct DataSet
source::String file::String
gpsource::String
preview::String preview::String
data::String data::String
end end
@ -365,7 +366,7 @@ end
Send a string to gnuplot's STDIN. Send a string to gnuplot's STDIN.
The commands sent through `write` are not stored in the current session (use `newcmd` to save commands in the current session). The commands sent through `write` are not stored in the current session (use `add_cmd` to save commands in the current session).
""" """
write(gp::DrySession, str::AbstractString) = nothing write(gp::DrySession, str::AbstractString) = nothing
function write(gp::GPSession, str::AbstractString) function write(gp::GPSession, str::AbstractString)
@ -444,36 +445,35 @@ newBlockName(gp::DrySession) = string("\$data", length(gp.datas)+1)
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
function newdataset(gp::DrySession, name::String, accum::Vector{String}) function add_inlineblock(gp::DrySession, gpsource::String, accum::Vector{String})
source = name # source is the same as name prepend!(accum, [gpsource * " << EOD"])
prepend!(accum, [source * " << EOD"])
append!( accum, ["EOD"]) append!( accum, ["EOD"])
preview = (length(accum) < 6 ? accum : [accum[1:5]..., "...", accum[end]]) preview = "GNUPLOT ($(gp.sid)) " .* (length(accum) < 6 ? accum : [accum[1:5]..., "...", accum[end]])
d = DataSet(source, join("GNUPLOT ($(gp.sid)) " .* preview, "\n"), join(accum, "\n")) d = DataSet("", gpsource, join(preview, "\n"), join(accum, "\n"))
gp.datas[name] = d gp.datas[gpsource] = d # name is the same as gpsource
write(gp, d) # Send now to gnuplot process write(gp, d) # send now to gnuplot process
return source return gpsource
end end
newdataset(gp::DrySession, name::String, args...) = newdataset(gp, name, arrays2datablock(args...)) add_dataset(gp::DrySession, name::String, args...) = add_inlineblock(gp, name, arrays2datablock(args...))
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
function newcmd(gp::DrySession, v::String) function add_cmd(gp::DrySession, v::String)
(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; args...) function add_cmd(gp::DrySession; args...)
for v in parseKeywords(;args...) for v in parseKeywords(;args...)
newcmd(gp, v) add_cmd(gp, v)
end end
return nothing return nothing
end end
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
function newplot(gp::DrySession, plotspec) function add_plot(gp::DrySession, plotspec)
push!(gp.plots[gp.curmid].elems, plotspec) push!(gp.plots[gp.curmid].elems, plotspec)
end end
@ -652,9 +652,9 @@ function driver(args...; flag3d=false)
@assert maximum(length.(dataset)) == 0 "One (or more) input arrays are empty" @assert maximum(length.(dataset)) == 0 "One (or more) input arrays are empty"
else else
isnothing(setname) && (setname = newBlockName(gp)) isnothing(setname) && (setname = newBlockName(gp))
source = newdataset(gp, setname, dataset...) source = add_dataset(gp, setname, dataset...)
if !isnothing(plotspec) if !isnothing(plotspec)
newplot(gp, source * " " * plotspec) add_plot(gp, source * " " * plotspec)
gp.plots[gp.curmid].flag3d = flag3d gp.plots[gp.curmid].flag3d = flag3d
end end
end end
@ -684,13 +684,13 @@ function driver(args...; flag3d=false)
(isPlot, is3d, cmd) = isPlotCmd(arg) (isPlot, is3d, cmd) = isPlotCmd(arg)
if isPlot # ==> a (s)plot command if isPlot # ==> a (s)plot command
gp.plots[gp.curmid].flag3d = is3d gp.plots[gp.curmid].flag3d = is3d
newplot(gp, cmd) add_plot(gp, cmd)
else # ==> a command else # ==> a command
newcmd(gp, arg) add_cmd(gp, arg)
end end
end end
elseif isa(arg, Tuple) && length(arg) == 2 && isa(arg[1], Symbol) elseif isa(arg, Tuple) && length(arg) == 2 && isa(arg[1], Symbol)
newcmd(gp; [arg]...) # ==> a keyword/value pair add_cmd(gp; [arg]...) # ==> a keyword/value pair
elseif isa(arg, Pair) # ==> a named dataset elseif isa(arg, Pair) # ==> a named dataset
@assert typeof(arg[1]) == String @assert typeof(arg[1]) == String
@assert arg[1][1] == '$' @assert arg[1][1] == '$'
@ -701,13 +701,13 @@ function driver(args...; flag3d=false)
end end
dataset_completed() dataset_completed()
elseif isa(arg, Histogram1D) elseif isa(arg, Histogram1D)
newcmd(gp, "set grid") add_cmd(gp, "set grid")
push!(dataset, arg.bins) push!(dataset, arg.bins)
push!(dataset, arg.counts) push!(dataset, arg.counts)
plotspec = "w histep notit lw 2 lc rgb 'black'" plotspec = "w histep notit lw 2 lc rgb 'black'"
dataset_completed() dataset_completed()
elseif isa(arg, Histogram2D) elseif isa(arg, Histogram2D)
newcmd(gp, "set autoscale fix") add_cmd(gp, "set autoscale fix")
push!(dataset, arg.bins1) push!(dataset, arg.bins1)
push!(dataset, arg.bins2) push!(dataset, arg.bins2)
push!(dataset, arg.counts) push!(dataset, arg.counts)