Fixes Open-Systems-Pharmacology#186 coord_cartesian update both axis …

…limits

R/plotconfiguration-axis.R

@@ -167,14 +167,15 @@ XAxisConfiguration <- R6::R6Class(
   public = list(
     #' @description Update axis configuration on a `ggplot` object
     #' @param plotObject `ggplot` object
+    #' @param ylim limits of `y` axis to prevent `coord_cartesian` to overwrite its properties
     #' @return A `ggplot` object with updated axis properties
-    updatePlot = function(plotObject) {
+    updatePlot = function(plotObject, ylim = NULL) {
       validateIsOfType(plotObject, "ggplot")
       # Update font properties
       plotObject <- plotObject + ggplot2::theme(axis.text.x = private$.font$createPlotFont())
       # Update limits using coor_cartesian to prevent ggplot to remove data and crash
       suppressMessages(
-        plotObject <- plotObject + ggplot2::coord_cartesian(xlim = private$.limits)
+        plotObject <- plotObject + ggplot2::coord_cartesian(xlim = private$.limits, ylim = ylim)
       )
       # Update scales and ticks
       if (isIncluded(private$.scale, Scaling$discrete)) {
@@ -207,13 +208,14 @@ YAxisConfiguration <- R6::R6Class(
 
     #' @description Update axis configuration on a `ggplot` object
     #' @param plotObject `ggplot` object
+    #' @param xlim limits of `x` axis to prevent `coord_cartesian` to overwrite its properties
     #' @return A `ggplot` object with updated axis properties
-    updatePlot = function(plotObject) {
+    updatePlot = function(plotObject, xlim = NULL) {
       validateIsOfType(plotObject, "ggplot")
       # Update font properties
       plotObject <- plotObject + ggplot2::theme(axis.text.y = private$.font$createPlotFont())
       suppressMessages(
-        plotObject <- plotObject + ggplot2::coord_cartesian(ylim = private$.limits)
+        plotObject <- plotObject + ggplot2::coord_cartesian(xlim = xlim, ylim = private$.limits)
       )
       # Update scales and ticks
       if (isIncluded(private$.scale, Scaling$discrete)) {

R/utilities-axis.R

@@ -27,7 +27,7 @@ setXAxis <- function(plotObject,
   # R6 class not cloned will spread modifications into newPlotObject$plotConfiguration$xAxis
   xAxis <- newPlotObject$plotConfiguration$xAxis
   eval(parseVariableToObject("xAxis", c("limits", "scale", "ticks", "ticklabels", "font"), keepIfNull = TRUE))
-  newPlotObject <- xAxis$updatePlot(newPlotObject)
+  newPlotObject <- xAxis$updatePlot(newPlotObject, ylim = newPlotObject$plotConfiguration$yAxis$limits)
   return(newPlotObject)
 }
 
@@ -60,7 +60,7 @@ setYAxis <- function(plotObject,
   # R6 class not cloned will spread modifications into newPlotObject$plotConfiguration$yAxis
   yAxis <- newPlotObject$plotConfiguration$yAxis
   eval(parseVariableToObject("yAxis", c("limits", "scale", "ticks", "ticklabels", "font"), keepIfNull = TRUE))
-  newPlotObject <- yAxis$updatePlot(newPlotObject)
+  newPlotObject <- yAxis$updatePlot(newPlotObject, xlim = newPlotObject$plotConfiguration$xAxis$limits)
   return(newPlotObject)
 }