Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/paper edits #14

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Bugfix/paper edits #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c9459
remove the edata_cname from sample choices when uploading CoreMS data
clabornd Dec 2, 2024
4091ba4
update ftmsRanalysis to include hotfix in lockfile, version 1.2.4
clabornd Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: FREDA
Title: An app for the processing and visualization of Fourier-transform mass spectrometry data.
Version: 1.2.3
Version: 1.2.4
Authors@R: c(person("Lisa", "Bramer", "[email protected]", role = "aut", "cre"),
person("Daniel", "Claborne", "[email protected]", role = c("aut")))
Description: A frontend application which exposes functionality of the ftmsRanalysis R package. See
Expand Down
6 changes: 5 additions & 1 deletion Reactive_Variables/upload_revals.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ emeta_cnames <- reactive({names(Emeta())})

# Object: Sample names from e_data
sample_names <- reactive({
setdiff(edata_cnames(), input$edata_id_col)
if (!is.null(revals$uploaded_data) & is.null(input$file_edata$datapath)) {
setdiff(edata_cnames(), attr(revals$uploaded_data, "cnames")$edata_cname)
} else {
setdiff(edata_cnames(), input$edata_id_col)
}
})

# Create reactive fake f_data (used when action button creates peakData())
Expand Down
Loading