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

cleanup and renaming constants

Browse Source
This commit is contained in:
Thomas Breloff 2015-09-21 12:15:40 -04:00
parent 85040d6104
commit 031058cd0c
6 changed files with 56 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/args.jl
View File

@ -1,35 +1,15 @@
# const COLORS = [:black, :blue, :green, :red, :darkGray, :darkCyan, :darkYellow, :darkMagenta, const _allAxes = [:auto, :left, :right]
# :darkBlue, :darkGreen, :darkRed, :gray, :cyan, :yellow, :magenta] const _allTypes = [:none, :line, :step, :stepinverted, :sticks, :scatter,
:heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc]
const _allStyles = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
const _allMarkers = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon]
# const COLORS = distinguishable_colors(20) supportedAxes(::PlottingPackage) = _allAxes
const AXES = [:left, :right] supportedTypes(::PlottingPackage) = _allTypes
const TYPES = [:line, supportedStyles(::PlottingPackage) = _allStyles
:step, supportedMarkers(::PlottingPackage) = _allMarkers
:stepinverted,
:sticks,
:scatter,
:heatmap,
:hexbin,
:hist,
:bar,
:hline,
:vline,
:ohlc,
]
const STYLES = [:solid, :dash, :dot, :dashdot, :dashdotdot]
const MARKERS = [:ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon]
const ALL_AXES = vcat(:auto, AXES)
const ALL_TYPES = vcat(:none, TYPES)
const ALL_STYLES = vcat(:auto, STYLES)
const ALL_MARKERS = vcat(:none, :auto, MARKERS)
supportedAxes(::PlottingPackage) = ALL_AXES
supportedTypes(::PlottingPackage) = ALL_TYPES
supportedStyles(::PlottingPackage) = ALL_STYLES
supportedMarkers(::PlottingPackage) = ALL_MARKERS
subplotSupported(::PlottingPackage) = true subplotSupported(::PlottingPackage) = true
supportedAxes() = supportedAxes(plotter()) supportedAxes() = supportedAxes(plotter())
@ -43,47 +23,47 @@ subplotSupported() = subplotSupported(plotter())
const _seriesDefaults = Dict{Symbol, Any}() const _seriesDefaults = Dict{Symbol, Any}()
# series-specific # series-specific
_seriesDefaults[:axis] = :left _seriesDefaults[:axis] = :left
_seriesDefaults[:color] = :auto _seriesDefaults[:color] = :auto
_seriesDefaults[:label] = "AUTO" _seriesDefaults[:label] = "AUTO"
_seriesDefaults[:width] = 1 _seriesDefaults[:width] = 1
_seriesDefaults[:linetype] = :line _seriesDefaults[:linetype] = :line
_seriesDefaults[:linestyle] = :solid _seriesDefaults[:linestyle] = :solid
_seriesDefaults[:marker] = :none _seriesDefaults[:marker] = :none
_seriesDefaults[:markercolor] = :match _seriesDefaults[:markercolor] = :match
_seriesDefaults[:markersize] = 6 _seriesDefaults[:markersize] = 6
_seriesDefaults[:nbins] = 100 # number of bins for heatmaps and hists _seriesDefaults[:nbins] = 100 # number of bins for heatmaps and hists
_seriesDefaults[:heatmap_c] = (0.15, 0.5) _seriesDefaults[:heatmap_c] = (0.15, 0.5)
_seriesDefaults[:fillto] = nothing # fills in the area _seriesDefaults[:fillto] = nothing # fills in the area
_seriesDefaults[:reg] = false # regression line? _seriesDefaults[:reg] = false # regression line?
_seriesDefaults[:group] = nothing _seriesDefaults[:group] = nothing
_seriesDefaults[:ribbon] = nothing _seriesDefaults[:ribbon] = nothing
_seriesDefaults[:args] = [] # additional args to pass to the backend _seriesDefaults[:args] = [] # additional args to pass to the backend
_seriesDefaults[:kwargs] = [] # additional keyword args to pass to the backend _seriesDefaults[:kwargs] = [] # additional keyword args to pass to the backend
# note: can be Vector{Dict} or Vector{Tuple} # note: can be Vector{Dict} or Vector{Tuple}
const _plotDefaults = Dict{Symbol, Any}() const _plotDefaults = Dict{Symbol, Any}()
# plot globals # plot globals
_plotDefaults[:title] = "" _plotDefaults[:title] = ""
_plotDefaults[:xlabel] = "" _plotDefaults[:xlabel] = ""
_plotDefaults[:ylabel] = "" _plotDefaults[:ylabel] = ""
_plotDefaults[:yrightlabel] = "" _plotDefaults[:yrightlabel] = ""
_plotDefaults[:legend] = true _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] = (800,600) _plotDefaults[:size] = (800,600)
_plotDefaults[:windowtitle] = "Plots.jl" _plotDefaults[:windowtitle] = "Plots.jl"
_plotDefaults[:show] = false _plotDefaults[:show] = false
# TODO: x/y scales # TODO: x/y scales
const ARGS = sort(collect(intersect(keys(_seriesDefaults), keys(_plotDefaults)))) const _allArgs = sort(collect(intersect(keys(_seriesDefaults), keys(_plotDefaults))))
supportedArgs(::PlottingPackage) = ARGS supportedArgs(::PlottingPackage) = _allArgs
supportedArgs() = supportedArgs(plotter()) supportedArgs() = supportedArgs(plotter())
@ -101,7 +81,7 @@ autopick_ignore_none_auto(notarr, idx::Integer) = notarr
# Alternate args # Alternate args
const keyAliases = Dict( const _keyAliases = Dict(
:c => :color, :c => :color,
:l => :label, :l => :label,
:w => :width, :w => :width,
@ -144,16 +124,16 @@ const keyAliases = Dict(
:display => :show, :display => :show,
) )
# add all pluralized forms to the keyAliases dict # add all pluralized forms to the _keyAliases dict
for arg in keys(_seriesDefaults) for arg in keys(_seriesDefaults)
keyAliases[makeplural(arg)] = arg _keyAliases[makeplural(arg)] = arg
end end
function replaceAliases!(d::Dict) function replaceAliases!(d::Dict)
for (k,v) in d for (k,v) in d
if haskey(keyAliases, k) if haskey(_keyAliases, k)
d[keyAliases[k]] = v d[_keyAliases[k]] = v
delete!(d, k) delete!(d, k)
end end
end end

4
src/backends/gadfly.jl
View File

@ -7,8 +7,8 @@ export gadfly!
gadfly!() = plotter!(:gadfly) gadfly!() = plotter!(:gadfly)
supportedArgs(::GadflyPackage) = setdiff(ARGS, [:heatmap_c, :pos]) supportedArgs(::GadflyPackage) = setdiff(_allArgs, [:heatmap_c, :pos])
supportedAxes(::GadflyPackage) = setdiff(ALL_AXES, [:right]) supportedAxes(::GadflyPackage) = setdiff(_allAxes, [: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]
supportedMarkers(::GadflyPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon] supportedMarkers(::GadflyPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon]

4
src/backends/pyplot.jl
View File

@ -8,8 +8,8 @@ pyplot!() = plotter!(:pyplot)
# ------------------------------- # -------------------------------
supportedArgs(::PyPlotPackage) = setdiff(ARGS, [:reg, :heatmap_c, :fillto, :pos]) supportedArgs(::PyPlotPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos])
supportedAxes(::PyPlotPackage) = ALL_AXES supportedAxes(::PyPlotPackage) = _allAxes
supportedTypes(::PyPlotPackage) = [:none, :line, :step, :stepinverted, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar] supportedTypes(::PyPlotPackage) = [:none, :line, :step, :stepinverted, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar]
supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot] supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot]
supportedMarkers(::PyPlotPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :hexagon] supportedMarkers(::PyPlotPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :hexagon]

10
src/backends/template.jl
View File

@ -10,11 +10,11 @@ export [pkgname]!
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
supportedArgs(::[PkgName]Package) = ARGS supportedArgs(::[PkgName]Package) = _allArgs
supportedAxes(::[PkgName]Package) = ALL_AXES supportedAxes(::[PkgName]Package) = _allAxes
supportedTypes(::[PkgName]Package) = ALL_TYPES supportedTypes(::[PkgName]Package) = _allTypes
supportedStyles(::[PkgName]Package) = ALL_STYLES supportedStyles(::[PkgName]Package) = _allStyles
supportedMarkers(::[PkgName]Package) = ALL_MARKERS supportedMarkers(::[PkgName]Package) = _allMarkers
subplotSupported(::[PkgName]Package) = false subplotSupported(::[PkgName]Package) = false
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------

2
src/backends/unicodeplots.jl
View File

@ -8,7 +8,7 @@ unicodeplots!() = plotter!(:unicodeplots)
# ------------------------------- # -------------------------------
supportedArgs(::UnicodePlotsPackage) = setdiff(ARGS, [:reg, :heatmap_c, :fillto, :pos]) supportedArgs(::UnicodePlotsPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos])
supportedAxes(::UnicodePlotsPackage) = [:auto, :left] supportedAxes(::UnicodePlotsPackage) = [:auto, :left]
supportedTypes(::UnicodePlotsPackage) = [:none, :line, :step, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline] supportedTypes(::UnicodePlotsPackage) = [:none, :line, :step, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
supportedStyles(::UnicodePlotsPackage) = [:auto, :solid] supportedStyles(::UnicodePlotsPackage) = [:auto, :solid]

6
src/backends/winston.jl
View File

@ -30,11 +30,11 @@ const winston_marker = Dict(:none=>".",
) )
supportedArgs(::WinstonPackage) = setdiff(ARGS, [:heatmap_c, :fillto, :pos, :markercolor, :background_color]) supportedArgs(::WinstonPackage) = setdiff(_allArgs, [:heatmap_c, :fillto, :pos, :markercolor, :background_color])
supportedAxes(::WinstonPackage) = [:auto, :left] supportedAxes(::WinstonPackage) = [:auto, :left]
supportedTypes(::WinstonPackage) = [:none, :line, :sticks, :scatter, :hist, :bar] supportedTypes(::WinstonPackage) = [:none, :line, :sticks, :scatter, :hist, :bar]
supportedStyles(::WinstonPackage) = intersect(ALL_STYLES, collect(keys(winston_linestyle))) # [:auto, :solid, :dash, :dot, :dashdot] supportedStyles(::WinstonPackage) = intersect(_allStyles, collect(keys(winston_linestyle))) # [:auto, :solid, :dash, :dot, :dashdot]
supportedMarkers(::WinstonPackage) = intersect(ALL_MARKERS, collect(keys(winston_marker))) # [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1] supportedMarkers(::WinstonPackage) = intersect(_allMarkers, collect(keys(winston_marker))) # [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1]
subplotSupported(::WinstonPackage) = false subplotSupported(::WinstonPackage) = false
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------