From 74cb788843977c25d791d92b53711d21684c5d31 Mon Sep 17 00:00:00 2001
From: Vincent Ott <123652963+vincentott@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:25:00 +0200
Subject: [PATCH] outline colors now sensitive to user-specific factorLevel
 order

---
 R/raincloudPlots.R | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/R/raincloudPlots.R b/R/raincloudPlots.R
index 2faba3d9..f673c8f9 100644
--- a/R/raincloudPlots.R
+++ b/R/raincloudPlots.R
@@ -459,25 +459,12 @@ raincloudPlotsInternal <- function(jaspResults, dataset, options) {
   if (options[["secondaryFactor"]] != "") {
     nSecondaryLevels <- nlevels(onlyFactors$secondaryFactor)
     levelColors      <- jaspGraphs::JASPcolors(palette = options[["colorPalette"]], asFunction = TRUE)(nSecondaryLevels)
-
-    # levelColors are in alphabetical order of levels, not in input order with which JASP user enters them
-    # So, we have to rearrange them from alphabetical to input order
-    levelsActualOrder    <- levels(onlyFactors$secondaryFactor)
-    levelsAlphabetical   <- sort(levelsActualOrder)  # This is the order for levelColors
-    reorderedLevelColors <- levelColors[match(levelsActualOrder, levelsAlphabetical)]
-
-    possibleCombis$color <- rep(reorderedLevelColors, nlevels(onlyFactors$primaryFactor))
+    possibleCombis$color <- levelColors
 
   } else if (options[["colorAnyway"]]) {
     nPrimaryLevels       <- nlevels(onlyFactors$primaryFactor)
     levelColors          <- jaspGraphs::JASPcolors(palette = options[["colorPalette"]], asFunction = TRUE)(nPrimaryLevels)
-
-    # See previous if-statement for explanation of following
-    levelsActualOrder    <- levels(onlyFactors$primaryFactor)
-    levelsAlphabetical   <- sort(levelsActualOrder)
-    reorderedLevelColors <- levelColors[match(levelsActualOrder, levelsAlphabetical)]
-
-    possibleCombis$color <- reorderedLevelColors
+    possibleCombis$color <- levelColors
 
   } else {
     possibleCombis$color <- "black"  # Is not used further