Merge pull request #13 from esqLABS/develop

Merge develop into main for release 3.0.2
esqLABS · Jan 31, 2023 · 0a9f53c · 0a9f53c
2 parents 227fc9e + f70cc45
commit 0a9f53c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: esqlabsRLegacy
 Title: esqLABS utilities package legacy functions
-Version: 3.0.1
+Version: 3.0.2
 Authors@R: 
     c(person("esqLABS GmbH", role = c("cph", "fnd")),
       person("Pavel", "Balazki", role = c("cre", "aut"), email = "pavel.balazki@esqlabs.com"),
@@ -30,4 +30,4 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# esqlabsRLegacy 3.0.2
+
+Predicted vs observed plots respect the colors of simulated results.
+
+----
+
 # esqlabsRLegacy 3.0.1
 
 Fixes unit conversion error when trying to plot data with geometric standard 

diff --git a/R/utilities-data-mapping.R b/R/utilities-data-mapping.R
@@ -470,6 +470,12 @@ plotPredictedVsObserved <- function(dataMapping, foldDistance = 2, timeDiffThres
       # Apply scaling to simulated results
       simulatedPointsX <- simulatedResult$xValuesProcessed(dataMapping$xUnit)
       simulatedPointsY <- simulatedResult$yValuesProcessed(dataMapping$yUnit)
+
+      # Setting the color to the color defined for the simulation result.
+      if (!is.null(simulatedResult$color)) {
+        colors[[graphicsParIdx]] <- simulatedResult$color
+      }
+
       # Iterate through each observed data point and find the simulated value
       # with the closest x-value.
       for (i in seq_along(dataPointsX)) {