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

gadfly display size and fix: check for line_style

Browse Source
This commit is contained in:
Thomas Breloff 2015-09-20 21:12:56 -04:00
parent c20a7b3c69
commit 8b34d4417b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/args.jl
View File

@ -74,7 +74,7 @@ _plotDefaults[:legend] = true
_plotDefaults[:background_color] = colorant"white" _plotDefaults[:background_color] = colorant"white"
_plotDefaults[:xticks] = true _plotDefaults[:xticks] = true
_plotDefaults[:yticks] = true _plotDefaults[:yticks] = true
_plotDefaults[:size] = (600,400) _plotDefaults[:size] = (800,600)
_plotDefaults[:windowtitle] = "Plots.jl" _plotDefaults[:windowtitle] = "Plots.jl"
_plotDefaults[:show] = false _plotDefaults[:show] = false

19
src/backends/gadfly.jl
View File

@ -7,7 +7,7 @@ export gadfly!
gadfly!() = plotter!(:gadfly) gadfly!() = plotter!(:gadfly)
supportedArgs(::GadflyPackage) = setdiff(ARGS, [:heatmap_c, :fillto, :pos]) supportedArgs(::GadflyPackage) = setdiff(ARGS, [:heatmap_c, :pos])
supportedAxes(::GadflyPackage) = setdiff(ALL_AXES, [:right]) supportedAxes(::GadflyPackage) = setdiff(ALL_AXES, [:right])
supportedTypes(::GadflyPackage) = [:none, :line, :step, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc] supportedTypes(::GadflyPackage) = [:none, :line, :step, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc]
supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot] supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
@ -108,13 +108,17 @@ function addGadflySeries!(gplt, d::Dict)
gfargs = [] gfargs = []
# if my PR isn't present, don't set the line_style
extra_theme_args = Gadfly.isdefined(:getStrokeVector) ? [(:line_style, getGadflyStrokeVector(d[:linestyle]))] : []
# line_style = getGadflyStrokeVector(d[:linestyle])
# set theme: color, line width, and point size # set theme: color, line width, and point size
line_width = d[:width] * (d[:linetype] == :none ? 0 : 1) * Gadfly.px # 0 width when we don't show a line line_width = d[:width] * (d[:linetype] == :none ? 0 : 1) * Gadfly.px # 0 width when we don't show a line
line_style = getGadflyStrokeVector(d[:linestyle])
theme = Gadfly.Theme(default_color = d[:color], theme = Gadfly.Theme(default_color = d[:color],
line_width = line_width, line_width = line_width,
default_point_size = 0.5 * d[:markersize] * Gadfly.px, default_point_size = 0.5 * d[:markersize] * Gadfly.px,
line_style = line_style) extra_theme_args...)
# line_style = line_style)
push!(gfargs, theme) push!(gfargs, theme)
# first things first... lets so the sticks hack # first things first... lets so the sticks hack
@ -193,16 +197,20 @@ function plot!(::GadflyPackage, plt::Plot; kw...)
plt plt
end end
function setGadflyDisplaySize(w,h)
Compose.set_default_graphic_size(w * Compose.px, h * Compose.px)
end
function Base.display(::GadflyPackage, plt::Plot) function Base.display(::GadflyPackage, plt::Plot)
setGadflyDisplaySize(plt.initargs[:size]...)
display(plt.o) display(plt.o)
end end
# ------------------------------- # -------------------------------
function savepng(::GadflyPackage, plt::PlottingObject, fn::AbstractString; function savepng(::GadflyPackage, plt::PlottingObject, fn::AbstractString;
w = 6 * Gadfly.inch, w = plt.initargs[:size][1] * Gadfly.px, # 6 * Gadfly.inch,
h = 4 * Gadfly.inch) h = plt.initargs[:size][2] * Gadfly.px) # 4 * Gadfly.inch)
o = getGadflyContext(plt.plotter, plt) o = getGadflyContext(plt.plotter, plt)
Gadfly.draw(Gadfly.PNG(fn, w, h), o) Gadfly.draw(Gadfly.PNG(fn, w, h), o)
end end
@ -231,5 +239,6 @@ end
function Base.display(::GadflyPackage, subplt::Subplot) function Base.display(::GadflyPackage, subplt::Subplot)
setGadflyDisplaySize(plt.initargs[:size]...)
display(buildGadflySubplotContext(subplt)) display(buildGadflySubplotContext(subplt))
end end