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

Process user recipes depth-first rather than breadth-first to enforce the plot order given in the recipe

Browse Source
This commit is contained in:
Martin Biel 2017-08-15 18:03:57 +02:00
parent 11c71d7a5d
commit 33a15f1e93
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pipeline.jl
View File

@ -60,29 +60,26 @@ function _process_userrecipes(plt::Plot, d::KW, args)
args = _preprocess_args(d, args, still_to_process) args = _preprocess_args(d, args, still_to_process)
# for plotting recipes, swap out the args and update the parameter dictionary # for plotting recipes, swap out the args and update the parameter dictionary
# we are keeping a queue of series that still need to be processed. # we are keeping a stack of series that still need to be processed.
# each pass through the loop, we pop one off and apply the recipe. # each pass through the loop, we pop one off and apply the recipe.
# the recipe will return a list a Series objects... the ones that are # the recipe will return a list a Series objects... the ones that are
# finished (no more args) get added to the kw_list, and the rest go into the queue # finished (no more args) get added to the kw_list, the ones that are not
# for processing. # are placed on top of the stack and are then processed further.
kw_list = KW[] kw_list = KW[]
while !isempty(still_to_process) while !isempty(still_to_process)
# grab the first in line to be processed and pass it through apply_recipe # grab the first in line to be processed and either add it to the kw_list or
# to generate a list of RecipeData objects (data + attributes) # pass it through apply_recipe to generate a list of RecipeData objects (data + attributes)
# for further processing.
next_series = shift!(still_to_process) next_series = shift!(still_to_process)
rd_list = RecipesBase.apply_recipe(next_series.d, next_series.args...)
for recipedata in rd_list
# recipedata should be of type RecipeData. if it's not then the inputs must not have been fully processed by recipes # recipedata should be of type RecipeData. if it's not then the inputs must not have been fully processed by recipes
if !(typeof(recipedata) <: RecipeData) if !(typeof(next_series) <: RecipeData)
error("Inputs couldn't be processed... expected RecipeData but got: $recipedata") error("Inputs couldn't be processed... expected RecipeData but got: $recipedata")
end end
if isempty(next_series.args)
if isempty(recipedata.args) _process_userrecipe(plt, kw_list, next_series)
_process_userrecipe(plt, kw_list, recipedata)
else else
# args are non-empty, so there's still processing to do... add it back to the queue rd_list = RecipesBase.apply_recipe(next_series.d, next_series.args...)
push!(still_to_process, recipedata) prepend!(still_to_process,rd_list)
end
end end
end end