Skip to content

Commit

Permalink
Handle data.tables in MAP project objects
Browse files Browse the repository at this point in the history
  • Loading branch information
clabornd committed Dec 2, 2024
1 parent 828afd3 commit 5d43fcc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
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.2
Version: 1.2.3
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
9 changes: 9 additions & 0 deletions Observers/startup_observers.R
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ observe({
)
} else {
# store in some reactive variable that e_data and e_meta....essentially check exists and use if so.
# convert the data in ftms_obj into data.frame if it is in data.table format.
if (inherits(ftms_obj$Data$e_data, "data.table")) {
ftms_obj$Data$e_data <- as.data.frame(ftms_obj$Data$e_data)
}

if (inherits(ftms_obj$Data$e_meta, "data.table")) {
ftms_obj$Data$e_meta <- as.data.frame(ftms_obj$Data$e_meta)
}

revals$map_project <- ftms_obj
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ui <- tagList(useShinyjs(),
),

navbarPage(
title = tags$div("FREDA", tags$span(style = "font-size:small", "v1.2.2")),
title = tags$div("FREDA", tags$span(style = "font-size:small", "v1.2.3")),
windowTitle = 'FREDA',
id = "top_page",
theme = "yeti.css",
Expand Down

0 comments on commit 5d43fcc

Please sign in to comment.