Fix #318 legend in demography and pk parameter vpcs

* Fix #318 legend in demography and pk parameter vpcs * Remove word "Population" from legend title
Open-Systems-Pharmacology · Sep 17, 2020 · 974b5fe · 974b5fe
1 parent c7f3780
commit 974b5fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/R/utilities-calculate-pk-parameters.R b/R/utilities-calculate-pk-parameters.R
@@ -274,7 +274,7 @@ plotPopulationPKParameters <- function(structureSets,
           # Get the table for reference population
           referenceData <- data.frame(
             x = c(-Inf, Inf),
-            "Population" = paste("Simulated", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", referencePopulationName)
+            "Population" = paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range, "of", referencePopulationName)
           )
           referenceData[, c("ymin", "median", "ymax")] <- pkParameterTable[referencePopulationName, c(3, 5, 7)]
 
@@ -286,7 +286,7 @@ plotPopulationPKParameters <- function(structureSets,
 
           for (populationName in populationNames[!populationNames %in% referencePopulationName]) {
             comparisonData <- aggregatedData[aggregatedData$Population %in% populationName, ]
-            comparisonData$Population <- paste("Simulated", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", comparisonData$Population)
+            comparisonData$Population <- paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range)
 
             comparisonVpcPlot <- vpcParameterPlot(
               data = comparisonData,
@@ -305,7 +305,7 @@ plotPopulationPKParameters <- function(structureSets,
         # Regular range plots not associated to workflow type
         for (populationName in populationNames) {
           vpcData <- aggregatedData[aggregatedData$Population %in% populationName, ]
-          vpcData$Population <- paste("Simulated", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", vpcData$Population)
+          vpcData$Population <- paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range)
           vpcPlot <- vpcParameterPlot(
             data = vpcData,
             metaData = vpcMetaData,
@@ -462,6 +462,7 @@ vpcParameterPlot <- function(data,
       size = 1
     )
   vpcPlot <- tlf::setLegendPosition(plotObject = vpcPlot, position = reDefaultLegendPosition)
+  vpcPlot <- vpcPlot + ggplot2::theme(legend.title = ggplot2::element_blank())
 
   return(vpcPlot)
 }

diff --git a/R/utilities-demography.R b/R/utilities-demography.R
@@ -128,7 +128,7 @@ plotDemographyParameters <- function(structureSets,
           ymin = rep(AggregationConfiguration$functions$ymin(referenceData[, parameterName]), 2),
           median = rep(AggregationConfiguration$functions$middle(referenceData[, parameterName]), 2),
           ymax = rep(AggregationConfiguration$functions$ymax(referenceData[, parameterName]), 2),
-          "Population" = paste("Simulated ", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", referencePopulationName)
+          "Population" = paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range, "of", referencePopulationName)
         )
 
         referenceVpcPlot <- vpcParameterPlot(
@@ -139,7 +139,7 @@ plotDemographyParameters <- function(structureSets,
 
         for (populationName in populationNames[!populationNames %in% referencePopulationName]) {
           comparisonData <- aggregatedData[aggregatedData$Population %in% populationName, ]
-          comparisonData$Population <- paste("Simulated ", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", comparisonData$Population)
+          comparisonData$Population <- paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range)
 
           comparisonVpcPlot <- vpcParameterPlot(
             data = comparisonData,
@@ -157,7 +157,7 @@ plotDemographyParameters <- function(structureSets,
 
       for (populationName in populationNames) {
         vpcData <- aggregatedData[aggregatedData$Population %in% populationName, ]
-        vpcData$Population <- paste("Simulated ", AggregationConfiguration$names$middle, AggregationConfiguration$names$range, "for", vpcData$Population)
+        vpcData$Population <- paste("Simulated", AggregationConfiguration$names$middle, "and", AggregationConfiguration$names$range)
 
         vpcPlot <- vpcParameterPlot(
           data = vpcData,