diff --git a/docs/example_generation.jl b/docs/example_generation.jl index b8916f0e..ac5e02c2 100644 --- a/docs/example_generation.jl +++ b/docs/example_generation.jl @@ -91,7 +91,7 @@ const examples = PlotExample[ [ :(y = rand(10)), :(plot(y, ann=(3,y[3],"this is #3"))), - :(annotate!([(5,y[5],"this is #5"),(8.4,y[10],"this is #10")])) + :(annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])) ]), ] diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl index 4fa93d0e..9b6db620 100644 --- a/src/backends/gadfly.jl +++ b/src/backends/gadfly.jl @@ -11,11 +11,11 @@ gadfly() = backend(:gadfly) supportedArgs(::GadflyPackage) = [ :annotation, :args, - :axis, + # :axis, :background_color, :color, :fillto, - :foreground_color, + # :foreground_color, :group, # :heatmap_c, :kwargs, diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index c261e273..a6838a8a 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -8,7 +8,48 @@ pyplot() = backend(:pyplot) # ------------------------------- -supportedArgs(::PyPlotPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos, :xlims, :ylims, :xticks, :yticks]) +# supportedArgs(::PyPlotPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos, :xlims, :ylims, :xticks, :yticks]) +supportedArgs(::PyPlotPackage) = [ + :annotation, + :args, + :axis, + :background_color, + :color, + # :fillto, + :foreground_color, + :group, + # :heatmap_c, + :kwargs, + :label, + :layout, + :legend, + :linestyle, + :linetype, + :marker, + :markercolor, + :markersize, + :n, + :nbins, + :nc, + :nr, + # :pos, + # :reg, + # :ribbon, + :show, + :size, + :title, + :width, + :windowtitle, + :x, + :xlabel, + # :xlims, + # :xticks, + :y, + :ylabel, + # :ylims, + :yrightlabel, + # :yticks, + ] supportedAxes(::PyPlotPackage) = _allAxes supportedTypes(::PyPlotPackage) = [:none, :line, :path, :step, :stepinverted, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar] supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot] diff --git a/src/backends/qwt.jl b/src/backends/qwt.jl index 45a77e7a..cf6ea216 100644 --- a/src/backends/qwt.jl +++ b/src/backends/qwt.jl @@ -6,7 +6,48 @@ immutable QwtPackage <: PlottingPackage end export qwt qwt() = backend(:qwt) -supportedArgs(::QwtPackage) = setdiff(_allArgs, [:xlims, :ylims, :xticks, :yticks]) +# supportedArgs(::QwtPackage) = setdiff(_allArgs, [:xlims, :ylims, :xticks, :yticks]) +supportedArgs(::QwtPackage) = [ + :annotation, + :args, + :axis, + :background_color, + :color, + :fillto, + :foreground_color, + :group, + :heatmap_c, + :kwargs, + :label, + :layout, + :legend, + :linestyle, + :linetype, + :marker, + :markercolor, + :markersize, + :n, + :nbins, + :nc, + :nr, + :pos, + :reg, + # :ribbon, + :show, + :size, + :title, + :width, + :windowtitle, + :x, + :xlabel, + # :xlims, + # :xticks, + :y, + :ylabel, + # :ylims, + :yrightlabel, + # :yticks, + ] supportedTypes(::QwtPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar] supportedMarkers(::QwtPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon] diff --git a/src/backends/template.jl b/src/backends/template.jl index aa1acd42..d0199b7d 100644 --- a/src/backends/template.jl +++ b/src/backends/template.jl @@ -10,7 +10,48 @@ export [pkgname] # --------------------------------------------------------------------------- -supportedArgs(::[PkgName]Package) = _allArgs +# supportedArgs(::[PkgName]Package) = _allArgs +supportedArgs(::[PkgName]Package) = [ + :annotation, + :args, + :axis, + :background_color, + :color, + :fillto, + :foreground_color, + :group, + # :heatmap_c, + :kwargs, + :label, + :layout, + :legend, + :linestyle, + :linetype, + :marker, + :markercolor, + :markersize, + :n, + :nbins, + :nc, + :nr, + # :pos, + :reg, + # :ribbon, + :show, + :size, + :title, + :width, + :windowtitle, + :x, + :xlabel, + :xlims, + :xticks, + :y, + :ylabel, + :ylims, + # :yrightlabel, + :yticks, + ] supportedAxes(::[PkgName]Package) = _allAxes supportedTypes(::[PkgName]Package) = _allTypes supportedStyles(::[PkgName]Package) = _allStyles diff --git a/src/backends/unicodeplots.jl b/src/backends/unicodeplots.jl index 62ad5f21..ae4f21eb 100644 --- a/src/backends/unicodeplots.jl +++ b/src/backends/unicodeplots.jl @@ -8,7 +8,48 @@ unicodeplots() = backend(:unicodeplots) # ------------------------------- -supportedArgs(::UnicodePlotsPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos, :xlims, :ylims, :xticks, :yticks]) +# supportedArgs(::UnicodePlotsPackage) = setdiff(_allArgs, [:reg, :heatmap_c, :fillto, :pos, :xlims, :ylims, :xticks, :yticks]) +supportedArgs(::UnicodePlotsPackage) = [ + # :annotation, + # :args, + # :axis, + # :background_color, + # :color, + # :fillto, + # :foreground_color, + :group, + # :heatmap_c, + # :kwargs, + :label, + # :layout, + :legend, + :linestyle, + :linetype, + :marker, + # :markercolor, + # :markersize, + # :n, + :nbins, + # :nc, + # :nr, + # :pos, + # :reg, + # :ribbon, + :show, + :size, + :title, + :width, + :windowtitle, + :x, + :xlabel, + # :xlims, + # :xticks, + :y, + :ylabel, + # :ylims, + # :yrightlabel, + # :yticks, + ] supportedAxes(::UnicodePlotsPackage) = [:auto, :left] supportedTypes(::UnicodePlotsPackage) = [:none, :line, :path, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar] supportedStyles(::UnicodePlotsPackage) = [:auto, :solid] diff --git a/src/backends/winston.jl b/src/backends/winston.jl index 547cbc24..b66272f6 100644 --- a/src/backends/winston.jl +++ b/src/backends/winston.jl @@ -30,7 +30,48 @@ const winston_marker = Dict(:none=>".", ) -supportedArgs(::WinstonPackage) = setdiff(_allArgs, [:heatmap_c, :fillto, :pos, :markercolor, :background_color, :xlims, :ylims, :xticks, :yticks]) +# supportedArgs(::WinstonPackage) = setdiff(_allArgs, [:heatmap_c, :fillto, :pos, :markercolor, :background_color, :xlims, :ylims, :xticks, :yticks]) +supportedArgs(::WinstonPackage) = [ + :annotation, + # :args, + # :axis, + # :background_color, + :color, + :fillto, + # :foreground_color, + :group, + # :heatmap_c, + # :kwargs, + :label, + # :layout, + :legend, + :linestyle, + :linetype, + :marker, + :markercolor, + :markersize, + # :n, + :nbins, + # :nc, + # :nr, + # :pos, + :reg, + # :ribbon, + :show, + :size, + :title, + :width, + :windowtitle, + :x, + :xlabel, + # :xlims, + # :xticks, + :y, + :ylabel, + # :ylims, + # :yrightlabel, + # :yticks, + ] supportedAxes(::WinstonPackage) = [:auto, :left] supportedTypes(::WinstonPackage) = [:none, :line, :path, :sticks, :scatter, :hist, :bar] supportedStyles(::WinstonPackage) = intersect(_allStyles, collect(keys(winston_linestyle)))