Remove now unnecessary helper in runPlotMaker

Open-Systems-Pharmacology · Nov 23, 2021 · 5677189 · 5677189
1 parent 9448cbf
commit 5677189
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/inst/plot-maker/app.R b/inst/plot-maker/app.R
@@ -581,7 +581,7 @@ server <- function(input, output) {
   })
   output$xAxisScale <- renderUI({
     plotConfiguration <- getPlotConfiguration()
-    selectInput("xAxisScale2", label = "scale", choices = Scaling, selected = asScale(plotConfiguration$xAxis$scale))
+    selectInput("xAxisScale2", label = "scale", choices = Scaling, selected = plotConfiguration$xAxis$scale)
   })
   output$xAxisLimitsMin <- renderUI({
     plotConfiguration <- getPlotConfiguration()
@@ -627,7 +627,7 @@ server <- function(input, output) {
   })
   output$yAxisScale <- renderUI({
     plotConfiguration <- getPlotConfiguration()
-    selectInput("yAxisScale2", label = "scale", choices = Scaling, selected = asScale(plotConfiguration$yAxis$scale))
+    selectInput("yAxisScale2", label = "scale", choices = Scaling, selected = plotConfiguration$yAxis$scale)
   })
   output$yAxisLimitsMin <- renderUI({
     plotConfiguration <- getPlotConfiguration()

diff --git a/inst/plot-maker/helpers.R b/inst/plot-maker/helpers.R
@@ -76,19 +76,6 @@ isIncluded <- function(values, parentValues) {
   return(as.logical(min(values %in% parentValues)))
 }
 
-
-#' @title asScale
-#' @description translate ggplot2 scale into tlf `Scaling` argument
-asScale <- function(scale) {
-  if (isIncluded(scale, "identity")) {
-    return(Scaling$lin)
-  }
-  if (isIncluded(scale, "log10")) {
-    return(Scaling$log)
-  }
-  return(scale)
-}
-
 #' @title tlfInput
 #' @description translate shiny input into tlf argument
 #' replacing "none", "" and NA by NULL