tdhock · tdhock · Nov 2, 2016 · Nov 2, 2016 · Nov 2, 2016 · Nov 2, 2016
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,16 +1,21 @@
+# Generated by roxygen2: do not edit by hand
+
+export(animint)
 export(animint2dir)
 export(animint2gist)
 export(animintOutput)
 export(geom_tallrect)
 export(geom_widerect)
 export(getLegendList)
+export(gg2animint)
 export(is.rgb)
 export(knit_print.animint)
-export(print.animint)
 export(makeDocs)
 export(make_bar)
 export(make_tallrect)
+export(make_tallrect_or_widerect)
 export(make_text)
+export(make_widerect)
 export(parsePlot)
 export(renderAnimint)
 export(saveLayer)

diff --git a/R/animint.R b/R/animint.R
@@ -1,3 +1,14 @@
+##' Create a new animint, which is a list of ggplots and options that
+##' has class "animint"
+##' @title animint
+##' @param ... passed to list
+##' @return a list of class "animint"
+##' @export
+##' @author Toby Dylan Hocking
+animint <- function(...){
+  structure(list(...), class="animint")
+}
+
 #' Convert a ggplot to a list.
 #' @param meta environment with previously calculated plot data, and a new plot to parse, already stored in plot and plot.name.
 #' @return nothing, info is stored in meta.
@@ -1332,7 +1343,6 @@ gg2animint <- function(...){
 #' \item shape. Open and closed circles can be represented by manipulating fill and colour scales and using default (circle) points, but d3 does not support many R shape types, so mapping between the two is difficult.
 #' }
 #'
-#' @aliases animint
 #' @param plot.list a named list of ggplots and option lists.
 #' @param out.dir directory to store html/js/csv files.
 #' @param json.file character string that names the JSON file with metadata associated with the plot.

diff --git a/inst/examples/WorldBank-facets.R b/inst/examples/WorldBank-facets.R
@@ -3,7 +3,7 @@ data(WorldBank)
 not.na <- subset(WorldBank, !(is.na(life.expectancy) | is.na(fertility.rate)))
 subset(not.na, is.na(not.na$population))
 subset(not.na, country == "Kuwait" & 1991 <= year & year <= 1995)
-not.na[not.na$country=="Kuwait", "population"] <- 1700000
+not.na[is.na(not.na$population), "population"] <- 1700000
 BOTH <- function(df, top, side){
   data.frame(df,
              top=factor(top, c("Fertility rate", "Years")),

diff --git a/inst/examples/test_knit_print.Rmd b/inst/examples/test_knit_print.Rmd
@@ -18,9 +18,9 @@ knit_meta()
 library(ggplot2) 
 library(animint)
 dat <- data.frame(x = 1:10, y = 1:10, label = rep(c("a178", "b934"), 5))
-q2 <- list(q = qplot(x, y, data = dat, colour = label, 
-                     xlab = "first plot with color legend"))
-structure(q2, class = "animint")
+animint(q = qplot(
+  x, y, data = dat, colour = label, 
+  xlab = "first plot with color legend"))
 ```
 
 Clicking on the plot above should not affect the plot below.

diff --git a/man/animint.Rd b/man/animint.Rd
diff --git a/man/animint2dir.Rd b/man/animint2dir.Rd
diff --git a/man/animint2gist.Rd b/man/animint2gist.Rd
diff --git a/man/animintOutput.Rd b/man/animintOutput.Rd
diff --git a/man/geom_tallrect.Rd b/man/geom_tallrect.Rd
diff --git a/man/geom_widerect.Rd b/man/geom_widerect.Rd
diff --git a/man/getCommonChunk.Rd b/man/getCommonChunk.Rd
diff --git a/man/getLegend.Rd b/man/getLegend.Rd
diff --git a/man/getLegendList.Rd b/man/getLegendList.Rd
diff --git a/man/gg2animint.Rd b/man/gg2animint.Rd
diff --git a/man/is.rgb.Rd b/man/is.rgb.Rd
diff --git a/man/knit_print.animint.Rd b/man/knit_print.animint.Rd
diff --git a/man/makeDocs.Rd b/man/makeDocs.Rd
diff --git a/man/make_bar.Rd b/man/make_bar.Rd
diff --git a/man/make_tallrect.Rd b/man/make_tallrect.Rd
diff --git a/man/make_tallrect_or_widerect.Rd b/man/make_tallrect_or_widerect.Rd
diff --git a/man/make_text.Rd b/man/make_text.Rd
diff --git a/man/make_widerect.Rd b/man/make_widerect.Rd
diff --git a/man/merge_recurse.Rd b/man/merge_recurse.Rd
diff --git a/man/parsePlot.Rd b/man/parsePlot.Rd
diff --git a/man/renderAnimint.Rd b/man/renderAnimint.Rd
diff --git a/man/run_servr.Rd b/man/run_servr.Rd
diff --git a/man/saveChunks.Rd b/man/saveChunks.Rd
diff --git a/man/saveLayer.Rd b/man/saveLayer.Rd
diff --git a/man/scale_size_animint.Rd b/man/scale_size_animint.Rd
diff --git a/man/selector.aes.Rd b/man/selector.aes.Rd
diff --git a/man/split.x.Rd b/man/split.x.Rd
diff --git a/man/tests_exit.Rd b/man/tests_exit.Rd
diff --git a/man/tests_init.Rd b/man/tests_init.Rd
diff --git a/man/tests_run.Rd b/man/tests_run.Rd
diff --git a/man/theme_animint.Rd b/man/theme_animint.Rd
diff --git a/man/toRGB.Rd b/man/toRGB.Rd
diff --git a/man/transform_shape.Rd b/man/transform_shape.Rd
diff --git a/man/varied.chunk.Rd b/man/varied.chunk.Rd