Merge branch 'master' of https://github.molgen.mpg.de/loosolab/MARMoSET

# Conflicts: # R/load_meta_functions.R
loosolab · Dec 5, 2019 · b708eb9 · b708eb9
2 parents 3d509d6 + 71da2bb
commit b708eb9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/R/load_meta_functions.R b/R/load_meta_functions.R
@@ -74,22 +74,25 @@ flatten_json <- function(json)
   {
     if(is.element("Gradient", names(json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]])))
     {
-      time <- c()
-      duration <- c()
-      flow <- c()
-      mixture <- c()
-      for(i in json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]])
+      if(!is.na(gradient_data))
       {
-        time <- c(time, i["Time [mm:ss]"][[1]])
-        duration <- c(duration, i["Duration [mm:ss]"][[1]])
-        flow <- c(flow, i["Flow [nl/min]"][[1]])
-        mixture <- c(mixture, i["Mixture [%B]"][[1]])
+        time <- c()
+        duration <- c()
+        flow <- c()
+        mixture <- c()
+        for(i in json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]])
+        {
+          time <- c(time, i["Time [mm:ss]"][[1]])
+          duration <- c(duration, i["Duration [mm:ss]"][[1]])
+          flow <- c(flow, i["Flow [nl/min]"][[1]])
+          mixture <- c(mixture, i["Mixture [%B]"][[1]])
+        }
+        json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]] <- NULL
+        json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Time [mm:ss]"]] <- time
+        json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Duration [mm:ss]"]] <- duration
+        json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Flow [nl/min]"]] <- flow
+        json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Mixture [%B]"]] <- mixture
       }
-      json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]] <- NULL
-      json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Time [mm:ss]"]] <- time
-      json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Duration [mm:ss]"]] <- duration
-      json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Flow [nl/min]"]] <- flow
-      json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Mixture [%B]"]] <- mixture
     }
   }
 

diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data/tmt_list.rda b/data/tmt_list.rda
diff --git a/inst/bin/MARMoSET.exe b/inst/bin/MARMoSET.exe
diff --git a/inst/bin/MARMoSET.pdb b/inst/bin/MARMoSET.pdb
diff --git a/inst/extdata/term_matching_tables.ods b/inst/extdata/term_matching_tables.ods