Figures with legends no longer drawn twice

USCCANA · Feb 16, 2024 · d1f84b1 · d1f84b1
1 parent 8b69d99
commit d1f84b1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,8 @@
 
 *  Unvalid arguments passed to `nplot()` now raise an error.
 
+*  Figures with legends are not drawn twice.
+
 
 # netplot 0.2-0
 

diff --git a/R/netplot.R b/R/netplot.R
@@ -615,20 +615,21 @@ nplot.default <- function(
 #' @param y,... Ignored
 print.netplot <- function(x, y = NULL, newpage = TRUE, legend = TRUE, ...) {
 
+  # If legend, then we avoid drawing twice
+  if (length(x$.legend_vertex_fill) && legend) {
+
+    color_nodes_legend(x)
+    return(invisible(x))
+
+  }
+
   # Drawing
   if (newpage) {
     grid::grid.newpage()
   }
 
   grid::grid.draw(x)
 
-  # If legend
-  if (legend) {
-
-    color_nodes_legend(x)
-
-  }
-
   # Storing the value
   .Last.netplot$set(x)
 

diff --git a/R/nplot_legend.R b/R/nplot_legend.R
@@ -69,7 +69,7 @@ nplot_legend <- function(
   gf <- grid::packGrob(grid::frameGrob(), g)
 
   # Adding the legend
-  legend.args   <- do.call(
+  legend.args <- do.call(
     grid::legendGrob,
     c(list(labels = labels, pch = pch, gp = gp), list(...))
     )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,8 @@

		* Unvalid arguments passed to `nplot()` now raise an error.

		* Figures with legends are not drawn twice.


		# netplot 0.2-0

Expand Down