Assume everything is a grid::grob. (#28)

DESCRIPTION

@@ -1,13 +1,14 @@
 Package: funcgeo
 Type: Package
 Title: Functional Geometry in R
-Version: 0.2.1
+Version: 0.2.1.9000
 Authors@R: person("Matthew", "Henderson", email = "[email protected]",
                   role = c("aut", "cre"))
 Description: Peter Henderson's Functional Geometry in R.
 License: MIT + file LICENSE
 Imports:
     grid
+Encoding: UTF-8
 RoxygenNote: 7.2.3
 URL: https://github.com/mhenderson/funcgeo
 BugReports: https://github.com/mhenderson/funcgeo/issues

NAMESPACE

@@ -1,10 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(above,grob)
-S3method(beside,grob)
-S3method(flip,grob)
-S3method(plot,picture)
-S3method(rot,grob)
 export(above)
 export(beside)
 export(cycle)

R/above.R

@@ -1,11 +1,14 @@
-#' Superimpose two pictures, one above the other.
+#' Superimpose two grobs, one above the other.
 #'
-#' @param p A picture
-#' @param q Another picture
+#' @param p A grob
+#' @param q Another grob
 #' @param m An integer
 #' @param n Another integer
-#' @return A picture
+#' @return A new grob obtained by superimposing p and q, one above the other.
 #' @export
-above <- function(p, q, m, n) {
-  UseMethod("above")
+above <- function(p, q, m = 1, n = 1) {
+  fg <- grid::frameGrob(layout = grid::grid.layout(2, 1))
+  fg <- grid::packGrob(fg, p, row = 1, height = grid::unit(m/(m + n), "npc"))
+  fg <- grid::packGrob(fg, q, row = 2, height = grid::unit(n/(m + n), "npc"))
+  return(fg)
 }

R/beside.R

@@ -1,12 +1,14 @@
-#' Superimpose two grobs, side-by-side.
+#' Superimpose two grobs side-by-side.
 #'
 #' @param p grob
 #' @param q grob
 #' @param m An integer
 #' @param n Another integer
 #' @return A grob
-#' @return A picture
 #' @export
 beside <- function(p, q, m = 1, n = 1) {
-  UseMethod("beside", p)
+  fg <- grid::frameGrob(layout = grid::grid.layout(1, 2))
+  fg <- grid::packGrob(fg, p, col = 1, width = grid::unit(m/(m + n), "npc"))
+  fg <- grid::packGrob(fg, q, col = 2, width = grid::unit(n/(m + n), "npc"))
+  return(fg)
 }

R/cycle.R

@@ -1,7 +1,7 @@
 #' Cycle
 #'
-#' @param p A picture
-#' @return A picture
+#' @param p A grob
+#' @return A grob
 #' @export
 cycle <- function(p) {
   return(quartet(p, rot(rot(rot(p))), rot(p), rot(rot(p))))

R/flip.R

@@ -1,8 +1,8 @@
-#' Flip a picture.
+#' Flip a grob.
 #'
-#' @param g A picture
-#' @return Flipped picture
+#' @param g A grob
+#' @return Flipped grob
 #' @export
 flip <- function(g) {
-  UseMethod("flip", g)
+  grid::editGrob(g, x = grid::unit(1, "npc") - g$x)
 }

R/nonet.R

@@ -1,14 +1,14 @@
 #' Nonet
 #'
-#' @param a A picture
-#' @param s Another picture
-#' @param d Yet another picture
-#' @param f The last picture
-#' @param g A picture
-#' @param h Another picture
-#' @param j Yet another picture
-#' @param k The last picture
-#' @param l The last picture
+#' @param a A grob
+#' @param s Another grob
+#' @param d Yet another grob
+#' @param f The last grob
+#' @param g A grob
+#' @param h Another grob
+#' @param j Yet another grob
+#' @param k The last grob
+#' @param l The last grob
 #' @return A grob
 #' @export
 nonet <- function(a, s, d, f, g, h, j, k, l) {  C <- beside(f, beside(g, h, m = 1, n = 1), m = 1, n = 2)

R/quartet.R

@@ -1,9 +1,9 @@
 #' Quartet
 #'
-#' @param p A picture
-#' @param q Another picture
-#' @param r Yet another picture
-#' @param s The last picture
+#' @param p A grob
+#' @param q Another grob
+#' @param r Yet another grob
+#' @param s The last grob
 #' @return A grob
 #' @export
 quartet <- function(p, q, r, s) {

R/rot.R

@@ -1,9 +1,11 @@
-#' Rotate a picture.
+#' Rotate a grob.
 #'
-#' @param g A picture
+#' @param g A grob
 #' @param angle An angle
-#' @return Rotated picture
+#' @return Rotated grob
 #' @export
-rot <- function(g, angle) {
-  UseMethod("rot", g)
+rot <- function(g, angle = 90) {
+  grid::editGrob(g, vp = grid::viewport(
+    angle  = ifelse(is.null(g$vp$angle), angle, g$vp$angle + angle))
+  )
 }