Check for wellID and generalization of plate layout (#21)

Co-authored-by: DriesSchaumont <[email protected]>

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 # New functionality
 
-* Make sure that the Well ID matches the required format (PR #22). 
+* Make sure that the Well ID matches the required format (PR #22 and PR #21). 
 
 # demultiplex v0.1.0
 

src/report/plateLayouts.R

@@ -40,6 +40,12 @@ plateLayout.annotation <- function(
   if (!(all(c("WellID", "SampleName") %in% colnames(plateData)))) {
     stop(" 'WellID' and 'SampleName' column required in plateData object")
   }
+
+  #Check WellID Format
+  checkWellID <- grepl("^[[:upper:]]{1,2}[[:digit:]]{1,2}$", plateData$WellID)
+  if(!all(checkWellID)){
+    stop("WellID does not have the correct format")
+  }
 
 
   plateData[, WellID := paste0(
@@ -49,7 +55,7 @@ plateLayout.annotation <- function(
     )
   )]
 
-  plateData <- platetools::fill_plate(plateData, "WellID", plate = 384)
+  plateData <- platetools::fill_plate(plateData, "WellID", plate = layout[1]*layout[2])
 
   plateData$column <- factor(
     sprintf(