nsides and size working again

R/geometry.R

@@ -205,5 +205,3 @@ map_attribute_to_shape <- function(x) {
 
 }
 
-
-

R/netplot.R

@@ -283,6 +283,31 @@ nplot.default <- function(
   netenv$M <- nrow(edgelist)
   netenv$graph_class <- class(x)
 
+  # Mapping attributes ---------------------------------------------------------
+
+  # Nsides
+  if (length(vertex.nsides) && inherits(vertex.nsides, "formula")) {
+
+    rhs <- as.character(vertex.nsides[[2]])
+    vertex.nsides <- map_attribute_to_shape(
+      get_graph_attribute(graph = x, attribute = rhs)
+    )
+
+  }
+
+  # And size
+  if (length(vertex.size) && inherits(vertex.size, "formula")) {
+
+    rhs <- as.character(vertex.size[[2]])
+    vertex.size <- get_graph_attribute(graph = x, attribute = rhs)
+
+    # Now check if it is numeric. If not, it should return an error
+    if (!is.numeric(vertex.size)) {
+      stop("vertex.size must be numeric")
+    }
+
+  }
+
   # Sampling edges -------------------------------------------------------------
   if (sample.edges < 1) {
 
@@ -332,11 +357,6 @@ nplot.default <- function(
     if (length(netenv[[p]]) > 0 && length(netenv[[p]]) < netenv$N)
       netenv[[p]] <- .rep(netenv[[p]], netenv$N)
 
-  # New: Handling vertex shape
-  if (!is.character(nsides) && !is.numeric(nsides)) {
-    stop("nsides parameter must be a character string or a numeric value")
-  }
-
   # Checking defaults for edges
   edge_par <- ls(pattern = "^edge\\.", envir = netenv)
   for (p in edge_par)
@@ -413,19 +433,10 @@ nplot.default <- function(
   )
 
   # Generating grobs -----------------------------------------------------------
-  if (length(vertex.nsides) && inherits(vertex.nsides, "formula")) {
-
-    rhs <- as.character(vertex.nsides[[2]])
-    vertex.nsides <- map_attribute_to_shape(
-      get_graph_attribute(graph = x, attribute = rhs)
-    )
-
-  }
-
   if (!skip.vertex) {
     grob.vertex <- vector("list", netenv$N)
     for (v in 1:netenv$N)
-      grob.vertex[[v]] <- grob_vertex(netenv, v, nsides = nsides)  # Pass nsides parameter
+      grob.vertex[[v]] <- grob_vertex(netenv, v) 
   } else
     grob.vertex <- NULL
 

README.Rmd

@@ -64,7 +64,9 @@ data("UKfaculty", package = "igraphdata")
 l <- layout_with_fr(UKfaculty)
 
 plot(UKfaculty, layout = l) # ala igraph
-nplot(UKfaculty, layout = l, vertex.nsides = ~ Group) # ala netplot
+
+V(UKfaculty)$ss <- runif(vcount(UKfaculty))
+nplot(UKfaculty, layout = l, vertex.nsides = ~ Group, vertex.size = ~ ss) # ala netplot
 sna::gplot(intergraph::asNetwork(UKfaculty), coord=l)
 ```