Rename Atoms and Molecules to AtomPlots and MoleculePlots

Open-Systems-Pharmacology · Sep 13, 2022 · b69e36f · b69e36f
1 parent ef51f9e
commit b69e36f
Show file tree

Hide file tree

Showing 52 changed files with 86 additions and 86 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -33,7 +33,7 @@ export(AestheticSelectionKeys)
 export(AggregationInput)
 export(AggregationSummary)
 export(Alignments)
-export(Atoms)
+export(AtomPlots)
 export(AxisConfiguration)
 export(BackgroundConfiguration)
 export(BackgroundElement)
@@ -61,7 +61,7 @@ export(LegendPositions)
 export(LegendTypes)
 export(LineElement)
 export(Linetypes)
-export(Molecules)
+export(MoleculePlots)
 export(ObsVsPredDataMapping)
 export(ObsVsPredPlotConfiguration)
 export(ObservedDataMapping)

diff --git a/R/themes.R b/R/themes.R
@@ -363,7 +363,7 @@ ThemePlotConfigurations <- R6::R6Class(
                           addErrorbar = NULL,
                           ...) {
       # Validate necessary input
-      atomPlotInputs <- as.character(setdiff(Atoms, "initializePlot"))
+      atomPlotInputs <- as.character(setdiff(AtomPlots, "initializePlot"))
       validateExpressions <- parse(text = paste0("validateIsOfType(", atomPlotInputs, ", 'ThemeAestheticSelections', nullAllowed = TRUE)"))
       eval(validateExpressions)
 
@@ -376,7 +376,7 @@ ThemePlotConfigurations <- R6::R6Class(
       # Aesthetics for molecule plots
       # This allows also user defined molecule plots
       userMoleculePlots <- list(...)
-      moleculePlotInputs <- union(names(userMoleculePlots), as.character(Molecules))
+      moleculePlotInputs <- union(names(userMoleculePlots), as.character(MoleculePlots))
 
       for (molecule in moleculePlotInputs) {
         # Empty list if not defined by user

diff --git a/R/utilities-enums.R b/R/utilities-enums.R
@@ -47,21 +47,21 @@ AestheticFields <- enum(c(
   "errorbars"
 ))
 
-#' @title Atoms
+#' @title AtomPlots
 #' @import ospsuite.utils
 #' @export
 #' @description
 #' List of all available atom plots
 #' @family enum helpers
-Atoms <- enum(c(.getTitlesFromFamilyTag("atom plots")))
+AtomPlots <- enum(c(.getTitlesFromFamilyTag("atom plots")))
 
-#' @title Molecules
+#' @title MoleculePlots
 #' @import ospsuite.utils
 #' @export
 #' @description
 #' List of all available molecule plots
 #' @family enum helpers
-Molecules <- enum(c(.getTitlesFromFamilyTag("molecule plots")))
+MoleculePlots <- enum(c(.getTitlesFromFamilyTag("molecule plots")))
 
 #' @title PlotConfigurations
 #' @import ospsuite.utils

diff --git a/man/AestheticFields.Rd b/man/AestheticFields.Rd
diff --git a/man/AestheticProperties.Rd b/man/AestheticProperties.Rd
diff --git a/man/Alignments.Rd b/man/Alignments.Rd
diff --git a/man/Atoms.Rd → man/AtomPlots.Rd b/man/Atoms.Rd → man/AtomPlots.Rd
diff --git a/man/BoxWhiskerDataMapping.Rd b/man/BoxWhiskerDataMapping.Rd
diff --git a/man/BoxWhiskerPlotConfiguration.Rd b/man/BoxWhiskerPlotConfiguration.Rd
diff --git a/man/DDIRatioDataMapping.Rd b/man/DDIRatioDataMapping.Rd
diff --git a/man/DDIRatioPlotConfiguration.Rd b/man/DDIRatioPlotConfiguration.Rd
diff --git a/man/DataMappings.Rd b/man/DataMappings.Rd
diff --git a/man/ExportFormats.Rd b/man/ExportFormats.Rd
diff --git a/man/ExportUnits.Rd b/man/ExportUnits.Rd
diff --git a/man/FontFaces.Rd b/man/FontFaces.Rd
diff --git a/man/HistogramDataMapping.Rd b/man/HistogramDataMapping.Rd
diff --git a/man/HistogramPlotConfiguration.Rd b/man/HistogramPlotConfiguration.Rd
diff --git a/man/HorizontalJustification.Rd b/man/HorizontalJustification.Rd
diff --git a/man/LegendPositions.Rd b/man/LegendPositions.Rd
diff --git a/man/LineElement.Rd b/man/LineElement.Rd
diff --git a/man/Linetypes.Rd b/man/Linetypes.Rd
diff --git a/man/Molecules.Rd → man/MoleculePlots.Rd b/man/Molecules.Rd → man/MoleculePlots.Rd
diff --git a/man/ObsVsPredDataMapping.Rd b/man/ObsVsPredDataMapping.Rd
diff --git a/man/ObsVsPredPlotConfiguration.Rd b/man/ObsVsPredPlotConfiguration.Rd
diff --git a/man/ObservedDataMapping.Rd b/man/ObservedDataMapping.Rd
diff --git a/man/PKRatioDataMapping.Rd b/man/PKRatioDataMapping.Rd
diff --git a/man/PKRatioPlotConfiguration.Rd b/man/PKRatioPlotConfiguration.Rd