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

Moved GR calls into display method

Browse Source
This commit is contained in:
Josef Heinen 2016-01-03 11:54:24 +01:00
parent 2b6619b3c4
commit b3613b68cd
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/backends/gr.jl
View File

@ -10,35 +10,13 @@ const gr_markertype = Dict(
:utriangle => -3, :dtriangle => -5, :pentagon => -14, :utriangle => -3, :dtriangle => -5, :pentagon => -14,
:cross => 2, :xcross => 5, :star5 => 3 ) :cross => 2, :xcross => 5, :star5 => 3 )
function _create_plot(pkg::GRPackage; kw...) function gr_display(plt::Plot{GRPackage})
d = Dict(kw) d = plt.plotargs
fig = Dict()
fig[:size] = d[:size]
Plot(fig, pkg, 0, d, Dict[])
end
function _add_series(::GRPackage, plt::Plot; kw...)
d = Dict(kw)
push!(plt.seriesargs, d)
plt
end
function _add_annotations{X,Y,V}(plt::Plot{GRPackage}, anns::AVec{@compat(Tuple{X,Y,V})})
for ann in anns
# TODO: add the annotation to the plot
end
end
# ----------------------------------------------------------------
function _before_update_plot(plt::Plot{GRPackage})
end
function _update_plot(plt::Plot{GRPackage}, d::Dict)
GR.clearws() GR.clearws()
mwidth, mheight, width, height = GR.inqdspsize() mwidth, mheight, width, height = GR.inqdspsize()
w, h = plt.o[:size] w, h = d[:size]
if w > h if w > h
ratio = float(h) / w ratio = float(h) / w
size = mwidth * w / width size = mwidth * w / width
@ -63,12 +41,7 @@ function _update_plot(plt::Plot{GRPackage}, d::Dict)
ymax = max(maximum(y), ymax) ymax = max(maximum(y), ymax)
end end
scale = 0 scale = d[:scale]
d[:xscale] == :log10 && (scale |= GR.OPTION_X_LOG)
d[:yscale] == :log10 && (scale |= GR.OPTION_Y_LOG)
get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X)
get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y)
if scale & GR.OPTION_X_LOG == 0 if scale & GR.OPTION_X_LOG == 0
xmin, xmax = GR.adjustlimits(xmin, xmax) xmin, xmax = GR.adjustlimits(xmin, xmax)
majorx = 5 majorx = 5
@ -141,7 +114,7 @@ function _update_plot(plt::Plot{GRPackage}, d::Dict)
end end
end end
if plt.plotargs[:legend] if d[:legend]
GR.selntran(0) GR.selntran(0)
GR.setscale(0) GR.setscale(0)
w = 0 w = 0
@ -175,14 +148,46 @@ function _update_plot(plt::Plot{GRPackage}, d::Dict)
GR.updatews() GR.updatews()
end end
function _update_plot_pos_size(plt::PlottingObject{GRPackage}, d::Dict) function _create_plot(pkg::GRPackage; kw...)
if haskey(d, :size) d = Dict(kw)
plt.o[:size] = d[:size] Plot(nothing, pkg, 0, d, Dict[])
end
function _add_series(::GRPackage, plt::Plot; kw...)
d = Dict(kw)
push!(plt.seriesargs, d)
plt
end
function _add_annotations{X,Y,V}(plt::Plot{GRPackage}, anns::AVec{@compat(Tuple{X,Y,V})})
for ann in anns
# TODO: add the annotation to the plot
end end
end end
# ---------------------------------------------------------------- # ----------------------------------------------------------------
function _before_update_plot(plt::Plot{GRPackage})
end
function _update_plot(plt::Plot{GRPackage}, d::Dict)
scale = 0
d[:xscale] == :log10 && (scale |= GR.OPTION_X_LOG)
d[:yscale] == :log10 && (scale |= GR.OPTION_Y_LOG)
get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X)
get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y)
plt.plotargs[:scale] = scale
for k in (:title, :xlabel, :ylabel, :linewidth, :linestyle, :markersize, :markershape)
haskey(d, k) && (plt.plotargs[k] = d[k])
end
end
function _update_plot_pos_size(plt::PlottingObject{GRPackage}, d::Dict)
end
# ----------------------------------------------------------------
# accessors for x/y data # accessors for x/y data
function Base.getindex(plt::Plot{GRPackage}, i::Int) function Base.getindex(plt::Plot{GRPackage}, i::Int)
@ -217,7 +222,7 @@ function Base.writemime(io::IO, ::MIME"image/png", plt::PlottingObject{GRPackage
end end
function Base.display(::PlotsDisplay, plt::Plot{GRPackage}) function Base.display(::PlotsDisplay, plt::Plot{GRPackage})
# TODO: display/show the plot gr_display(plt)
end end
function Base.display(::PlotsDisplay, plt::Subplot{GRPackage}) function Base.display(::PlotsDisplay, plt::Subplot{GRPackage})