Note/warning free!

Author: ldecicco-USGS

NAMESPACE

@@ -3,6 +3,7 @@
 S3method(gsplot,list)
 S3method(print,gsplot)
 export("%>%")
+export(abline)
 export(axis)
 export(calc_views)
 export(gsplot)

R/abline.R

@@ -7,21 +7,14 @@
 #' @param object gsplot object
 #' @param \dots Further graphical parameters may also be supplied as arguments. See 'Details'.
 #' @return modified gsplot object 
-#' @rdname points
-#' @examples
-#' gsNew <- gsplot(list())
-#' gsNew <- points(gsNew, y=1, x=2, col="blue", pch=18)
-#' gsNew <- points(gsNew, c(3,4,3), c(2,4,6))
-#' gsNew <- abline(gsNew, v=3, lty=1)
-#' gsNew
 #' @export
 abline <- function(object, ...) {
   overrideGraphics("abline", object, ...)
 }
 
 
 abline.gsplot <- function(object, x, y=NULL, ..., legend.name=NULL, side=c(1,2)){
-  current_list <- config("grid")
+  current_list <- config("abline")
   arguments <- list(x=x, y=y, ...)
 
   indicesToAdd <- !(names(current_list) %in% names(arguments))

R/calc_views.R

@@ -1,4 +1,11 @@
+#' calc_view
+#' 
+#' calc_view
+#'
+#'
+#' @param gsplot object
 #' @export
+#' @keywords internal
 calc_views <- function(gsplot){
 
   views <- group_views(gsplot)

R/legend.R

@@ -18,7 +18,7 @@
 #'  lines(x=c(3,4,3), y=c(2,4,6), legend.name="Example Lines", lty=5, col="orange") %>% 
 #'  points(x=1, y=2, side=c(3,2), legend.name="Example Points 1", pch=1, col="blue") %>% 
 #'  points(x=3, y=4, side=c(1,4), legend.name="Example Points 2", pch=5, col="red") %>% 
-#'  legend(location="topright")
+#'  legend(location="topright", title="LEGEND!!!")
 #' topright
 #' 
 #' defaultLegend <- gsplot(list()) %>% 
@@ -152,38 +152,41 @@ draw_legend <- function(gsplot) {
 
     smartLegend <- unique(smartLegend)
 
-    #only include pch if we have a non-NA entry for points
-    if(length(pts_i) > 0) {
-      legendParams <- append(legendParams, list(
-        pch=smartLegend$symbol
-      ))
-    }
-    
-    #only include lty if we have a non-NA entry for lines
-    if(length(lines_i) > 0) {
-      legendParams <- append(legendParams, list(
-        lty=smartLegend$line
-      ))
-    }
+    if(nrow(smartLegend) > 0){
 
-    legendParams <- append(legendParams, list(
-      legend=smartLegend$text, 
-      col=smartLegend$color
-    ))
-    
-    #for above/below, dynamically set the number of columns
-    location <- gsplot[['legend']][['gs.config']][['location']]
-    if(location == "below" || location == "above") {
-      itemsPerCol <- 3 #TODO load this from config
-      cols <- NROW(smartLegend) %/% 3;
-      if(NROW(smartLegend) %% 3 > 0) {
-        cols <- cols + 1
+      #only include pch if we have a non-NA entry for points
+      if(length(pts_i) > 0) {
+        legendParams <- append(legendParams, list(
+          pch=smartLegend$symbol
+        ))
+      }
+      
+      #only include lty if we have a non-NA entry for lines
+      if(length(lines_i) > 0) {
+        legendParams <- append(legendParams, list(
+          lty=smartLegend$line
+        ))
       }
+      
       legendParams <- append(legendParams, list(
-        ncol=cols
+        legend=smartLegend$text, 
+        col=smartLegend$color
       ))
+      
+      #for above/below, dynamically set the number of columns
+      location <- gsplot[['legend']][['gs.config']][['location']]
+      if(location == "below" || location == "above") {
+        itemsPerCol <- 3 #TODO load this from config
+        cols <- NROW(smartLegend) %/% 3;
+        if(NROW(smartLegend) %% 3 > 0) {
+          cols <- cols + 1
+        }
+        legendParams <- append(legendParams, list(
+          ncol=cols
+        ))
+      }
+      legend(legendParams) 
     }
-    legend(legendParams) 
   }
 }
 

R/points.R

@@ -1,15 +1,12 @@
 #' gsplot points
 #'
 #' Point stuff
-#' @usage 
-#' points(object, legend.name=NULL, side=c(1,2), ...)
 #' 
 #' @details Add additional functionality to points.
 #' 
 #' @param object gsplot object
 #' @param \dots Further graphical parameters may also be supplied as arguments. See 'Details'.
 #' @return modified gsplot object 
-#' @rdname points
 #' @examples
 #' gs <- gsplot(list())
 #' gsNew <- points(gs, y=1, x=2, col="blue", pch=18)

man/abline.Rd

@@ -0,0 +1,23 @@
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/abline.R
+\name{abline}
+\alias{abline}
+\title{gsplot abline}
+\usage{
+abline(object, ...)
+}
+\arguments{
+\item{object}{gsplot object}
+
+\item{\dots}{Further graphical parameters may also be supplied as arguments. See 'Details'.}
+}
+\value{
+modified gsplot object
+}
+\description{
+abline stuff
+}
+\details{
+Add additional functionality to points.
+}
+

man/calc_views.Rd

@@ -0,0 +1,16 @@
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/calc_views.R
+\name{calc_views}
+\alias{calc_views}
+\title{calc_view}
+\usage{
+calc_views(gsplot)
+}
+\arguments{
+\item{gsplot}{object}
+}
+\description{
+calc_view
+}
+\keyword{internal}
+

man/legend.Rd

@@ -29,7 +29,7 @@ topright <- gsplot(list()) \%>\%
  lines(x=c(3,4,3), y=c(2,4,6), legend.name="Example Lines", lty=5, col="orange") \%>\%
  points(x=1, y=2, side=c(3,2), legend.name="Example Points 1", pch=1, col="blue") \%>\%
  points(x=3, y=4, side=c(1,4), legend.name="Example Points 2", pch=5, col="red") \%>\%
- legend(location="topright")
+ legend(location="topright", title="LEGEND!!!")
 topright
 
 defaultLegend <- gsplot(list()) \%>\%

man/points.Rd

@@ -4,7 +4,7 @@
 \alias{points}
 \title{gsplot points}
 \usage{
-points(object, legend.name=NULL, side=c(1,2), ...)
+points(object, ...)
 }
 \arguments{
 \item{object}{gsplot object}