Adding nsides updates

R/grob_vertex.R

@@ -6,7 +6,34 @@
 #' Generating coordinates
 #' @noRd
 grob_vertex <- function(netenv, v) {
+  validate_netenv(netenv)
+  validate_params(v)
+  sides_lookup <- c(
+    triangle = list(sides = 3, rot = 0),
+    circle   = list(sides = 4, rot = 0),
+    diamond  = list(sides = 4, rot = 90),
+    pentagon = list(sides = 5, rot = 0),
+    hexagon  = list(sides = 6, rot = 0),
+    heptagon = list(sides = 7, rot = 0),
+    octagon  = list(sides = 8, rot = 0),
+    circle   = list(sides = 25, rot = 0)
+  )
+  # if(is.na(netenv$vertex.label[v])) {
+  #   stop("Missing vertex label value")
+  # }
+  # if(!netenv$vertex.label[v] %in% names(sides_lookup)) {
+  #   stop("Invalid vertex shape name: ", netenv$vertex.label[v])
+  # }
 
+  # if(is.na(netenv$layout[v, 1]) || is.na(netenv$layout[v, 2])) {
+  #   stop("Missing vertex coordinates")
+  # }
+  # if(netenv$layout[v, 1] < 0 || netenv$layout[v, 2] < 0) {
+  #   warning("Negative coordinate values")
+  # }
+  # if(!is.character(col)) {
+  #   stop("Invalid color value")
+  # }
   if (netenv$skip.vertex)
     return(
       grid::gTree(
@@ -19,6 +46,27 @@ grob_vertex <- function(netenv, v) {
       )
     )
 
+  # Only if it is character
+  if (is.numeric(netenv$vertex.nsides[v])) {
+
+    if(netenv$vertex.nsides[v] < 2) { # Only if numeric...
+      stop("Number of sides must be 2 or greater")
+    }
+
+  } else if (is.character(netenv$vertex.nsides[v]) {
+
+    if(netenv$vertex.nsides[v] %in% names(sides_lookup)) {
+      info <- sides_lookup[[netenv$vertex.nsides[v]]]
+      netenv$vertex.nsides[v] <- info$sides
+      netenv$vertex.rot[v] <- info$rot
+    } else {
+      stop("Invalid vertex shape name: ", netenv$vertex.nsides[v])
+    }
+
+  }
+
+  # If it is numeric, check the number of sides (as you do above)
+
   # Computing coordinates
   coords <- npolygon(
     x = netenv$layout[v, 1],
@@ -27,7 +75,6 @@ grob_vertex <- function(netenv, v) {
     r = netenv$vertex.size[v]*(1 - netenv$vertex.frame.prop[v]),
     d = netenv$vertex.rot[v]
   )
-
   # Frame coordinates
   framecoords <- npolygon(
     x = netenv$layout[v, 1],
@@ -36,37 +83,40 @@ grob_vertex <- function(netenv, v) {
     r = netenv$vertex.size[v],
     d = netenv$vertex.rot[v]
   )
-
+  # Create color palette
+  nsides <- unique(netenv$vertex.nsides)
+  ncolors <- length(nsides)
+  colors <- hsv(h = seq(0, 1, length.out = ncolors), v = 1, a = 1)
+  pal <- setNames(colors, nsides)
+  # Lookup color for this vertex based on number of sides
+  col <- pal[as.character(netenv$vertex.nsides[v])]
   # Returning
   ans <- grid::polygonGrob(
-    x    = c(coords[,1]),
-    y    = c(coords[,2]),
-    gp   = grid::gpar(
-      fill = netenv$vertex.color[v],
-      col  = netenv$vertex.color[v]
+    x = c(coords[,1]),
+    y = c(coords[,2]),
+    gp = grid::gpar(
+      fill = col,
+      col = col
     ),
     default.units = "native",
     name = "core"
   )
-
   ans <- grid::grobTree(
     grid::polygonGrob(
-      x    = framecoords[,1],
-      y    = framecoords[,2],
-      gp   = grid::gpar(
-        fill = netenv$vertex.frame.color[v],
-        col  = netenv$vertex.frame.color[v]
+      x = framecoords[,1],
+      y = framecoords[,2],
+      gp = grid::gpar(
+        fill = col,
+        col = col
       ),
       default.units = "native",
       name = "frame"
     ),
     ans,
     name = netplot_name$make(v)
   )
-
   # If the users is drawing text
   if (length(netenv$vertex.label) && !is.na(netenv$vertex.label[v])) {
-
     # Only if it is big enough
     if (netenv$label_threshold <= netenv$vertex.size[v])
       ans <- grid::addGrob(
@@ -86,8 +136,6 @@ grob_vertex <- function(netenv, v) {
           name = "label"
         )
       )
-
   }
-
   ans
 }