Make shape and size scales work like everything else

Author: hadley

R/scale-shape.r

@@ -1,9 +1,11 @@
-ScaleShape <- proto(ScaleDiscrete, expr={
+ScaleShapeDiscrete <- proto(ScaleDiscrete, expr={
   doc <- TRUE
   common <- NULL
   .input <- .output <- "shape"
   desc <- "Point glyph shapes"
   solid <- TRUE
+  aliases <- c("scale_shape")
+  
 
   new <- function(., name=NULL, solid=TRUE, limits = NULL, breaks = NULL, labels = NULL, formatter = identity, legend = TRUE) {
 
@@ -22,7 +24,7 @@ ScaleShape <- proto(ScaleDiscrete, expr={
   max_levels <- function(.) 6
 
   # Documentation -----------------------------------------------
-  objname <- "shape"
+  objname <- "shape_discrete"
   desc <- "Scale for shapes, aka glyphs"
   icon <- function(.) {
     gTree(children=gList(

R/scale-size.r

@@ -1,4 +1,4 @@
-ScaleSize <- proto(ScaleContinuous, expr={
+ScaleSizeContinuous <- proto(ScaleContinuous, expr={
   doc <- TRUE
   common <- NULL
   .input <- .output  <- "size"
@@ -17,7 +17,7 @@ ScaleSize <- proto(ScaleContinuous, expr={
   }
   output_breaks <- function(.) .$map(.$input_breaks())
 
-  objname <- "size"
+  objname <- "size_continuous"
   desc <- "Size scale for continuous variable"
   seealso <- list(
     "scale_manual" = "for sizing discrete variables"

R/scales-.r

@@ -169,18 +169,11 @@ Scales <- proto(Scale, expr={
 
     # Work out scale names
     scale_name_type <- paste("scale", new_aesthetics, vartypes, sep="_")
-    scale_name <- paste("scale", new_aesthetics, sep="_")
-    scale_name_generic <- paste("scale", vartypes, sep="_")
 
     for(i in 1:length(new_aesthetics)) {
-      scale <- tryNULL(get(scale_name_type[i]))
-      if (!is.null(scale)) {
-        .$add(scale())
-      } else {      
-        scale <- tryNULL(get(scale_name[i]))
-        if (!is.null(scale)) {
-          .$add(scale())
-        }
+      if (exists(scale_name_type[i])) {
+        scale <- get(scale_name_type[i])()
+        .$add(scale)
       }
     }
 

R/xxx.r

@@ -68,9 +68,11 @@ scale_linetype <- ScaleLinetype$build_accessor()
 scale_linetype_identity <- ScaleIdentity$build_accessor(list(variable = "\"linetype\""))
 scale_linetype_manual <- ScaleManual$build_accessor(list(variable = "\"linetype\""))
 scale_shape <- ScaleShape$build_accessor()
+scale_shape_discrete <- ScaleShapeDiscrete$build_accessor()
 scale_shape_identity <- ScaleIdentity$build_accessor(list(variable = "\"shape\""))
 scale_shape_manual <- ScaleManual$build_accessor(list(variable = "\"shape\""))
 scale_size <- ScaleSize$build_accessor()
+scale_size_continuous <- ScaleSizeContinuous$build_accessor()
 scale_size_discrete <- ScaleSizeDiscrete$build_accessor()
 scale_size_identity <- ScaleIdentity$build_accessor(list(variable = "\"size\""))
 scale_size_manual <- ScaleManual$build_accessor(list(variable = "\"size\""))