removed release from travis; push for series; update for subplot

This commit is contained in:
Thomas Breloff 2016-07-20 20:44:28 -04:00
parent 705dbf60fa
commit 461d5efc4b
3 changed files with 27 additions and 4 deletions

View File

@ -4,11 +4,11 @@ os:
- linux - linux
- osx - osx
julia: julia:
- release # - release
- nightly - nightly
matrix: # matrix:
allow_failures: # allow_failures:
- julia: nightly # - julia: nightly
# # before install: # # before install:
# # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi # # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

View File

@ -34,6 +34,7 @@ export
plot, plot,
plot!, plot!,
update!,
current, current,
default, default,

View File

@ -686,9 +686,17 @@ function push_z!(series::Series, zi)
return return
end end
function Base.push!(series::Series, yi)
x = extendSeriesByOne(series[:x])
expand_extrema!(series[:subplot][:xaxis], x[end])
series[:x] = x
push_y!(series, yi)
end
Base.push!(series::Series, xi, yi) = (push_x!(series,xi); push_y!(series,yi)) Base.push!(series::Series, xi, yi) = (push_x!(series,xi); push_y!(series,yi))
Base.push!(series::Series, xi, yi, zi) = (push_x!(series,xi); push_y!(series,yi); push_z!(series,zi)) Base.push!(series::Series, xi, yi, zi) = (push_x!(series,xi); push_y!(series,yi); push_z!(series,zi))
# -------------------------------------------------------
function update!(series::Series; kw...) function update!(series::Series; kw...)
d = KW(kw) d = KW(kw)
preprocessArgs!(d) preprocessArgs!(d)
@ -700,6 +708,20 @@ function update!(series::Series; kw...)
end end
end end
_series_updated(series[:subplot].plt, series) _series_updated(series[:subplot].plt, series)
series
end
function update!(sp::Subplot; kw...)
d = KW(kw)
preprocessArgs!(d)
for (k,v) in d
if haskey(_subplot_defaults, k)
sp[k] = v
else
warn("unused key $k in subplot update")
end
end
sp
end end
# ------------------------------------------------------- # -------------------------------------------------------