Fix mapping of vertical line from addLine

Open-Systems-Pharmacology · Oct 21, 2021 · 2726689 · 2726689
1 parent 4a22f4b
commit 2726689
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/atom-plots.R b/R/atom-plots.R
@@ -111,7 +111,7 @@ addScatter <- function(data = NULL,
     data <- data.frame(data, check.names = FALSE)
   }
 
-  dataMapping <- dataMapping %||% XYGDataMapping$new(x = x, y = y, data = data)
+  dataMapping <- dataMapping %||% XYGDataMapping$new(x = "x", y = "y", data = data)
   plotConfiguration <- plotConfiguration %||% PlotConfiguration$new(data = data, metaData = metaData, dataMapping = dataMapping)
   # Update plotConfiguration if user defined aesthetics
   eval(parseVariableToObject("plotConfiguration$points", c("color", "shape", "linetype", "size"), keepIfNull = TRUE))
@@ -254,7 +254,7 @@ addLine <- function(data = NULL,
     data <- data.frame(data, check.names = FALSE)
   }
 
-  dataMapping <- dataMapping %||% XYGDataMapping$new(x = x, y = y, data = data)
+  dataMapping <- dataMapping %||% XYGDataMapping$new(x = "x", y = "y", data = data)
   plotConfiguration <- plotConfiguration %||% PlotConfiguration$new(data = data, metaData = metaData, dataMapping = dataMapping)
   # Update plotConfiguration if user defined aesthetics
   eval(parseVariableToObject("plotConfiguration$lines", c("color", "shape", "linetype", "size"), keepIfNull = TRUE))

diff --git a/R/utilities-mapping.R b/R/utilities-mapping.R
@@ -215,8 +215,8 @@ smartMapping <- function(data) {
 
   # Names of data.frame variables
   variableNames <- names(data)
-  # If one column, set as y
-  if (ncol(data) == 1) {
+  # If one column, set as y unless name is "x"
+  if (ncol(data) == 1 & !(variableNames[1] %in% "x")) {
     mapping$y <- variableNames[1]
   }
   # If 2 columns, set as x, y