Skip to content

Commit 474effe

Browse files
committed
style: whitespace
1 parent 7885ccf commit 474effe

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

R/read_mzml.R

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,20 @@
2626

2727
read_mzml <- function(path, format_out = c("matrix", "data.frame"),
2828
data_format = c("long","wide"),
29-
parser=c("RaMS","mzR"),
30-
what=c("MS1","MS2", "BPC", "TIC", "DAD",
29+
parser = c("RaMS","mzR"),
30+
what = c("MS1","MS2", "BPC", "TIC", "DAD",
3131
"chroms", "metadata", "everything"),
3232
verbose = FALSE,
3333
...){
3434
parser <- match.arg(parser, c("RaMS", "mzR"))
3535
format_out <- match.arg(format_out, c("matrix", "data.frame"))
3636
data_format <- match.arg(data_format, c("long","wide"))
3737
what <- match.arg(what, c("MS1","MS2", "BPC", "TIC", "DAD",
38-
"chroms", "metadata", "everything"), several.ok = TRUE)
38+
"chroms", "metadata", "everything"),
39+
several.ok = TRUE)
3940
if (all(c("MS1","MS2", "BPC", "TIC", "DAD",
4041
"chroms", "metadata", "everything") %in% what)){
41-
what <- grep("everything",what, invert = TRUE,value = TRUE)
42+
what <- grep("everything", what, invert = TRUE, value = TRUE)
4243
}
4344
if (parser == "RaMS"){
4445
data <- RaMS::grabMSdata(path, grab_what = what, verbosity = verbose, ...)

R/read_thermoraw.R

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,23 @@ configure_thermo_parser <- function(reconfigure = FALSE, check = FALSE){
103103
exists <- file.exists(path_parser)
104104
if (!exists & !check){
105105
warning("ThermoRawFileParser not found!", immediate. = TRUE)
106-
path_parser <- readline(prompt="Please provide path to `ThermoRawFileParser.exe`):")
106+
path_parser <- readline(prompt = "Please provide path to `ThermoRawFileParser.exe`):")
107107
path_parser <- gsub("/", "\\\\", path_parser)
108-
writeLines(path_parser, con=system.file('shell/path_parser.txt', package='chromConverter'))
108+
writeLines(path_parser, con = system.file('shell/path_parser.txt',
109+
package = 'chromConverter'))
109110
}
110111
} else {
111-
shell_script <- readLines(system.file('shell/thermofileparser.sh', package='chromConverter'))
112+
shell_script <- readLines(system.file('shell/thermofileparser.sh',
113+
package = 'chromConverter'))
112114
path_parser <- strsplit(shell_script[2]," ")[[1]]
113115
path_parser <- path_parser[grep(".exe", path_parser)]
114116
exists <- file.exists(path_parser)
115117
if (!exists & !check){
116118
warning("ThermoRawFileParser not found!", immediate. = TRUE)
117-
path_parser <- readline(prompt="Please provide path to `ThermoRawFileParser.exe`):")
119+
path_parser <- readline(prompt = "Please provide path to `ThermoRawFileParser.exe`):")
118120
shell_script[2] <- paste0("mono ", path_parser, ' "$@"')
119-
writeLines(shell_script, con = system.file('shell/thermofileparser.sh', package='chromConverter'))
121+
writeLines(shell_script, con = system.file('shell/thermofileparser.sh',
122+
package = 'chromConverter'))
120123
}
121124
}
122125
if (check){

0 commit comments

Comments
 (0)