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

Updated

Browse Source
This commit is contained in:
Giorgio Calderone 2019-01-17 16:28:27 +01:00
parent 249072ef04
commit e36563990a
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -4,7 +4,7 @@ os:
- linux - linux
- osx - osx
julia: julia:
- 0.7 - 1.0
- nightly - nightly
notifications: notifications:
email: false email: false
@ -17,18 +17,11 @@ matrix:
allow_failures: allow_failures:
- julia: nightly - julia: nightly
## uncomment and modify the following lines to manually install system packages
addons:
apt: # apt-get for linux
packages:
- gnuplot
before_script: # homebrew for mac
- if [ $TRAVIS_OS_NAME = osx ]; then brew install gnuplot; fi
## uncomment the following lines to override the default test script ## uncomment the following lines to override the default test script
#script: #script:
# - julia -e 'Pkg.clone(pwd()); Pkg.build("Gnuplot"); Pkg.test("Gnuplot"; coverage=true)' # - julia -e 'Pkg.clone(pwd()); Pkg.build("Gnuplot"); Pkg.test("Gnuplot"; coverage=true)'
# after_success: # after_success:
# # push coverage results to Coveralls # # push coverage results to Coveralls
# - julia -e 'cd(Pkg.dir("Gnuplot")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' # - julia -e 'cd(Pkg.dir("Gnuplot")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

3
src/Gnuplot.jl
View File

@ -106,7 +106,6 @@ function CheckGnuplotVersion(cmd::AbstractString)
end end
if ver < v"4.7" if ver < v"4.7"
# Do not raise error in order to pass Travis CI test, since it has v4.6
error("gnuplot ver. >= 4.7 is required, but " * string(ver) * " was found.") error("gnuplot ver. >= 4.7 is required, but " * string(ver) * " was found.")
end end
@info " Gnuplot version: " * string(ver) @info " Gnuplot version: " * string(ver)
@ -214,7 +213,7 @@ end
# -------------------------------------------------------------------- # --------------------------------------------------------------------
writeread(gp::DrySession, str::AbstractString) = nothing writeread(gp::DrySession, str::AbstractString) = ""
function writeread(gp::Session, str::AbstractString) function writeread(gp::Session, str::AbstractString)
global state global state
write(gp.pin, "print 'GNUPLOT_CAPTURE_BEGIN'\n") write(gp.pin, "print 'GNUPLOT_CAPTURE_BEGIN'\n")

7
test/runtests.jl
View File

@ -54,11 +54,14 @@ name = "\$MyDataSet1"
@gp :- 2 xlab="X label" ylab="Residuals" :- @gp :- 2 xlab="X label" ylab="Residuals" :-
@gp :- "plot $name u 1:((f(\$1)-\$2) / \$3):(1) w errorbars notit" @gp :- "plot $name u 1:((f(\$1)-\$2) / \$3):(1) w errorbars notit"
# Retrieve values fr a, b and c # Retrieve values for a, b and c
a = 0; b = 0; c = 0;
try
a = parse(Float64, exec("print a")) a = parse(Float64, exec("print a"))
b = parse(Float64, exec("print b")) b = parse(Float64, exec("print b"))
c = parse(Float64, exec("print c")) c = parse(Float64, exec("print c"))
catch
end
gnuplot(:dry) gnuplot(:dry)
@gp :dry "f(x) = a * sin(b + c*x); a = 1; b = 1; c = 1;" :- @gp :dry "f(x) = a * sin(b + c*x); a = 1; b = 1; c = 1;" :-
@gp :- :dry "a = $a; b = $b; c = $c" :- @gp :- :dry "a = $a; b = $b; c = $c" :-