plotGrowthCurves() with species_panels = TRUE now plots the panel…

…s in the correct order. Closes #201
sizespectrum · Sep 4, 2021 · 61e58a4 · 61e58a4
1 parent 783d784
commit 61e58a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -86,8 +86,9 @@
   `plotGrowthCurves()` are now correct, and no longer extend above the
   asymptotic size.
 * `plotGrowthCurves()` with `species_panel = TRUE` now respects the `species`
-  argument to only show growth curves for selected species, and it works with
-  a MizerParams object as well as a MizerSim object.
+  argument to only show growth curves for selected species, it works with
+  a MizerParams object as well as a MizerSim object, and it shows the panels
+  in the correct order. #201
 * Reinstated the example .csv files that were missing from the package because
   the vignettes are no longer included.
 

diff --git a/R/plots.R b/R/plots.R
@@ -1156,12 +1156,12 @@ plotGrowthCurves <- function(object, species = NULL,
                 scale_x_continuous(name = "Age [years]") +
                 scale_y_continuous(name = "Size [g]") +
                 geom_hline(aes(yintercept = w_mat),
-                           data = tibble(Species = params@species_params$species[sp_sel],
+                           data = tibble(Species = factor(legend_levels),
                                          w_mat = params@species_params$w_mat[sp_sel]),
                            linetype = "dashed",
                            colour = "grey") +
                 geom_hline(aes(yintercept = w_inf),
-                           data = tibble(Species = params@species_params$species[sp_sel],
+                           data = tibble(Species = factor(legend_levels),
                                          w_inf = params@species_params$w_inf[sp_sel]),
                            linetype = "solid",
                            colour = "grey") +

diff --git a/docs/dev/news/index.html b/docs/dev/news/index.html