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

Ensure that empty arrays are not treated as scalars

Browse Source 
When running:

    @gp Float64[]

the data sent to Gnuplot (stored in $data0) are " Float64[]" rather
than "". This is because the empty array is incorrectly treated as a
scalar. This commit fixes that.

Note that the end result with and without this commit is the same.
Nothing is (re)drawn. Before, gnuplot complained with:

    Bad data on line 1 of file $data0

Now, gnuplot says:

    warning: Skipping data file with no valid points
This commit is contained in:
Michal Sojka 2019-05-13 10:03:11 +02:00
parent b1f11f5905
commit 0724b8fff4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Gnuplot.jl
View File

@ -328,9 +328,9 @@ function newdatasource(gp::DrySession, args...; name="")
@assert maxDim <= 3 "Array dimensions must be <= 3" @assert maxDim <= 3 "Array dimensions must be <= 3"
end end
dimX = 0 dimX = -1
dimY = 0 dimY = -1
dimZ = 0 dimZ = -1
count1D = 0 count1D = 0
for iarg in 1:length(args) for iarg in 1:length(args)
d = args[iarg] d = args[iarg]
@ -354,7 +354,7 @@ function newdatasource(gp::DrySession, args...; name="")
end end
@assert dimX == (size(d))[1] "Array size are incompatible" @assert dimX == (size(d))[1] "Array size are incompatible"
@assert dimY == (size(d))[2] "Array size are incompatible" @assert dimY == (size(d))[2] "Array size are incompatible"
@assert dimZ == 0 "Mixing 2D and 3D data is not allowed" @assert dimZ == -1 "Mixing 2D and 3D data is not allowed"
elseif ndims(d) == 3 elseif ndims(d) == 3
if iarg == 1 if iarg == 1
dimX = (size(d))[1] dimX = (size(d))[1]
@ -377,7 +377,7 @@ function newdatasource(gp::DrySession, args...; name="")
v = "$name << EOD" v = "$name << EOD"
push!(accum, v) push!(accum, v)
if dimZ > 0 # 3D if dimZ >= 0 # 3D
for ix in 1:dimX for ix in 1:dimX
for iy in 1:dimY for iy in 1:dimY
for iz in 1:dimZ for iz in 1:dimZ
@ -395,7 +395,7 @@ function newdatasource(gp::DrySession, args...; name="")
end end
push!(accum, "") push!(accum, "")
end end
elseif dimY > 0 # 2D elseif dimY >= 0 # 2D
for ix in 1:dimX for ix in 1:dimX
for iy in 1:dimY for iy in 1:dimY
if count1D == 0 if count1D == 0
@ -416,7 +416,7 @@ function newdatasource(gp::DrySession, args...; name="")
end end
push!(accum, "") push!(accum, "")
end end
elseif dimX > 0 # 1D elseif dimX >= 0 # 1D
for ix in 1:dimX for ix in 1:dimX
v = "" v = ""
for iarg in 1:length(args) for iarg in 1:length(args)