Skip to content

Commit

Permalink
New MSConvert version
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonCochran committed Jul 26, 2018
1 parent 56e7fd8 commit 13ed172
Show file tree
Hide file tree
Showing 12,464 changed files with 2,524,730 additions and 9,795 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions LipidMatch_Flow.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

UF SECIM LipidMatch Flow Beta Version 1.0
2018-05-30: new lipidomics libraries
2018-07-20: add all required R libraries for R-3.3.3

Start "" ".\LipidMatch_Flow\LipidMatch_Batch.exe"
Binary file modified LipidMatch_Flow/ConsoleControl.dll
Binary file not shown.
Binary file modified LipidMatch_Flow/ConsoleControl.pdb
Binary file not shown.
Binary file modified LipidMatch_Flow/ConsoleControlAPI.dll
Binary file not shown.
Binary file modified LipidMatch_Flow/ConsoleControlAPI.pdb
Binary file not shown.
Binary file modified LipidMatch_Flow/LipidMatch_Batch.exe
Binary file not shown.
Binary file modified LipidMatch_Flow/LipidMatch_Batch.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ Comments Column (row ID. Should be numeric,1,Must be changed to match your data
MZ Column (in feature table),2,Must be changed to match your data format
RT Column (in feature table),3,Must be changed to match your data format
row numeric data starts (in feature table),2,Must be changed to match your data format
Directory of Inputs,C:/Users/Jeremy/Desktop/Tamil_Test/LipidMatch_Run/,Directory
Directory of Libraries,C:/Users/Jeremy/Desktop/Desktop/Instrumentation/Software/MSms/LipidMatch_Workflow/LipidMatch_Flow_Versions/LipidMatch_Flow_Portable/LipidMatch_Flow/LipidMatch_Distribution/LipidMatch_Libraries/,Directory
Directory of Inputs,C:/aatemp_test/WorkDir10/LipidMatch_Run/,Directory
Directory of Libraries,C:/Users/Yang/Google Drive/SECIM_Remote/VS_Projects/LipidMatch_Flow_Portable/LipidMatch_Batch/LipidMatch_Distribution/LipidMatch_Libraries/,Directory
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ Comments Column (row ID. Should be numeric,1,Must be changed to match your data
MZ Column (in feature table),2,Must be changed to match your data format
RT Column (in feature table),3,Must be changed to match your data format
row numeric data starts (in feature table),2,Must be changed to match your data format
Directory of Inputs,C:/Users/Jeremy/Desktop/Demo_LM2/LipidMatch_Run/,Directory
Directory of Libraries,C:/Users/Jeremy/Desktop/Desktop/Instrumentation/Software/MSms/LipidMatch_Workflow/LipidMatch_Flow_Versions/LipidMatch_Flow_Portable/LipidMatch_Flow/LipidMatch_Distribution/LipidMatch_Libraries/,Directory
Directory of Inputs,C:/Users/Jeremy/Desktop/Desktop/Instrumentation/Software/MSms/LipidMatch/2017_8_05_LipidMatch_Distribution/ExampleData/,Directory
Directory of Libraries,C:/Users/Jeremy/Desktop/Desktop/Instrumentation/Software/MSms/LipidMatch/2017_8_05_LipidMatch_Distribution/LipidMatch_Libraries_Test/,Directory
13 changes: 6 additions & 7 deletions LipidMatch_Flow/LipidMatch_Distribution/LipidMatch.r
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@ ManuallyInputVariables <- FALSE


#Checks for updates, installs packagaes: "installr" "stringr" "sqldf" "gWidgets" "gWidgetstcltk" and "compiler"
if(!require(installr)) {
install.packages("installr"); install.packages("stringr"); require(installr)}
library(installr)

if("sqldf" %in% rownames(installed.packages()) == FALSE) {install.packages("sqldf")}
#if(!require(installr)) {
# install.packages("installr", repos = c(CRAN = "http://cran.rstudio.com")); install.packages("stringr", repos = c(CRAN = "http://cran.rstudio.com")); require(installr)}
#library(installr)
if("sqldf" %in% rownames(installed.packages()) == FALSE) {install.packages("sqldf", repos = c(CRAN = "http://cran.rstudio.com"))}
# if("compiler" %in% rownames(installed.packages()) == FALSE) {install.packages("compiler")}
if("gWidgets" %in% rownames(installed.packages()) == FALSE) {install.packages("gWidgets")}
if("gWidgetstcltk" %in% rownames(installed.packages()) == FALSE) {install.packages("gWidgetstcltk")}
if("gWidgets" %in% rownames(installed.packages()) == FALSE) {install.packages("gWidgets", repos = c(CRAN = "http://cran.rstudio.com"))}
if("gWidgetstcltk" %in% rownames(installed.packages()) == FALSE) {install.packages("gWidgetstcltk", repos = c(CRAN = "http://cran.rstudio.com"))}
require(gWidgets)
require(gWidgetstcltk)
options(guiToolkit="tcltk")
Expand Down
280 changes: 0 additions & 280 deletions LipidMatch_Flow/MZmine-2.26/LICENSE.txt

This file was deleted.

Loading

0 comments on commit 13ed172

Please sign in to comment.