Skip to content

Commit 697bcb9

Browse files
committed
[FEAT] - change table names
1 parent fe12758 commit 697bcb9

5 files changed

+20
-27
lines changed

R/importQFeatures.R

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#' \item The first section (Import) of the app allow to convert tables to a QFeatures object.
88
#' \item The second section (Pre-processing) of the app allow to perform some optional pre-processing steps.
99
#' }
10-
#' @param sample_table A dataframe that contains the sample table.
11-
#' @param input_table A dataframe that contains the input table.
10+
#' @param colData A dataframe that contains the sample table.
11+
#' @param assayData A dataframe that contains the input table.
1212
#'
1313
#' @return Return the "importQFeatures" shiny app object.
1414
#' @export
@@ -19,14 +19,14 @@
1919
#'
2020
#' data("sampleTable")
2121
#' data("inputTable")
22-
#' app <- importQFeatures(sample_table = sampleTable, input_table = inputTable)
22+
#' app <- importQFeatures(colData = sampleTable, assayData = inputTable)
2323
#'
2424
#' if (interactive()) {
2525
#' shiny::runApp(app)
2626
#' }
2727
#'
28-
importQFeatures <- function(sample_table = NULL, input_table = NULL) {
28+
importQFeatures <- function(colData = NULL, assayData = NULL) {
2929
ui <- build_ui()
30-
server <- build_server(sample_table, input_table)
30+
server <- build_server(colData, assayData)
3131
shinyApp(ui = ui, server = server)
3232
}

R/interface_module_box_read_table.R

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
box_read_table_ui <- function(id) {
1414
tagList(
1515
box(
16-
title = paste(
17-
upper_first(id),
18-
"Table",
19-
sep = " "
20-
),
16+
title = if (id == "input") "assayData" else "colData",
2117
status = "primary",
2218
width = 12,
2319
solidHeader = TRUE,

R/interface_module_qc_metrics.R

+10-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface_module_qc_metrics <- function(id, type) {
1616
box(
1717
title = "PCA",
1818
status = "primary",
19-
width = if (type == "features") 8 else 12,
19+
width = 8,
2020
solidHeader = FALSE,
2121
collapsible = TRUE,
2222
fluidRow(
@@ -48,16 +48,15 @@ interface_module_qc_metrics <- function(id, type) {
4848
)
4949
)
5050
),
51-
if (type == "features") {
52-
box(
53-
title = "Single Feature Visualisation",
54-
status = "primary",
55-
width = 4,
56-
solidHeader = FALSE,
57-
collapsible = TRUE,
58-
interface_module_viz_box(NS(id, "viz_box"))
59-
)
60-
}
51+
52+
box(
53+
title = "Single Feature Visualisation",
54+
status = "primary",
55+
width = 4,
56+
solidHeader = FALSE,
57+
collapsible = TRUE,
58+
interface_module_viz_box(NS(id, "viz_box"))
59+
)
6160
)
6261
)
6362
}

R/utils_global.R

-2
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,6 @@ features_boxplot <- function(assays_df) {
627627
#'
628628

629629
unique_feature_boxplot <- function(assays_df, feature) {
630-
print(head(assays_df))
631-
print(feature)
632630
plot <- ggplot(assays_df[assays_df$feature_type == feature, , drop = FALSE], aes(x = sample_type, y = intensity, colour = sample_type)) +
633631
geom_boxplot()
634632

man/importQFeatures.Rd

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)