Skip to content

Commit c91a8ee

Browse files
gogonzogogonzo
committed
rename mathods in teal.transform
1 parent 7ec893d commit c91a8ee

13 files changed

+173
-173
lines changed

‎R/tm_a_pca_picks.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ui_a_pca.picks <- function(id,
127127
tags$label("Encodings", class = "text-primary"),
128128
teal::teal_nav_item(
129129
label = tags$strong("Data selection"),
130-
teal.transform::module_input_ui(id = ns("dat"), spec = dat)
130+
teal.transform::picks_ui(id = ns("dat"), spec = dat)
131131
),
132132
bslib::accordion(
133133
open = TRUE,
@@ -232,7 +232,7 @@ srv_a_pca.picks <- function(id, data, dat, plot_height, plot_width, ggplot2_args
232232
moduleServer(id, function(input, output, session) {
233233
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
234234

235-
selectors <- teal.transform::module_input_srv(spec = list(dat = dat), data = data)
235+
selectors <- teal.transform::picks_srv(spec = list(dat = dat), data = data)
236236

237237
qenv <- reactive({
238238
validate_input(
@@ -252,7 +252,7 @@ srv_a_pca.picks <- function(id, data, dat, plot_height, plot_width, ggplot2_args
252252

253253
merged <- merge_srv("merge", data = qenv, selectors = selectors, output_name = "anl")
254254
anl_merged_q <- merged$data
255-
selected_vars <- reactive(merged$merge_vars()$dat)
255+
selected_vars <- reactive(merged$variables()$dat)
256256

257257
validate_data <- reactive({
258258
obj <- req(anl_merged_q())

‎R/tm_a_regression_picks.R‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ ui_a_regression.picks <- function(id,
150150
tags$label("Encodings", class = "text-primary"), tags$br(),
151151
teal::teal_nav_item(
152152
label = tags$strong("Response variable"),
153-
teal.transform::module_input_ui(id = ns("response"), spec = response)
153+
teal.transform::picks_ui(id = ns("response"), spec = response)
154154
),
155155
teal::teal_nav_item(
156156
label = tags$strong("Regressor variables"),
157-
teal.transform::module_input_ui(id = ns("regressor"), spec = regressor)
157+
teal.transform::picks_ui(id = ns("regressor"), spec = regressor)
158158
),
159159
radioButtons(
160160
ns("plot_type"),
@@ -183,7 +183,7 @@ ui_a_regression.picks <- function(id,
183183
),
184184
min = 1, max = 10, value = 9, ticks = FALSE, step = .1
185185
),
186-
teal.transform::module_input_ui(id = ns("outlier"), spec = outlier)
186+
teal.transform::picks_ui(id = ns("outlier"), spec = outlier)
187187
),
188188
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(decorators, "plot")),
189189
bslib::accordion(
@@ -246,7 +246,7 @@ srv_a_regression.picks <- function(id,
246246
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
247247
ns <- session$ns
248248

249-
selectors <- teal.transform::module_input_srv(
249+
selectors <- teal.transform::picks_srv(
250250
spec = list(response = response, regressor = regressor, outlier = outlier),
251251
data = data
252252
)
@@ -294,15 +294,15 @@ srv_a_regression.picks <- function(id,
294294
teal::validate_has_data(anl, 10)
295295

296296
teal::validate_has_data(
297-
anl[, c(merged$merge_vars()$response, merged$merge_vars()$regressor)], 10,
297+
anl[, c(merged$variables()$response, merged$variables()$regressor)], 10,
298298
complete = TRUE, allow_inf = FALSE
299299
)
300300

301301
form <- stats::as.formula(
302302
paste(
303-
merged$merge_vars()$response,
303+
merged$variables()$response,
304304
paste(
305-
merged$merge_vars()$regressor,
305+
merged$variables()$regressor,
306306
collapse = " + "
307307
),
308308
sep = " ~ "
@@ -332,7 +332,7 @@ srv_a_regression.picks <- function(id,
332332
""
333333
) %>%
334334
dplyr::if_else(is.na(.), "cooksd == NaN", .),
335-
env = list(outlier_cutoff = input$outlier_cutoff, label_var = merged$merge_vars()$outlier)
335+
env = list(outlier_cutoff = input$outlier_cutoff, label_var = merged$variables()$outlier)
336336
)
337337
})
338338

@@ -377,16 +377,16 @@ srv_a_regression.picks <- function(id,
377377
fit <- obj[["fit"]]
378378
anl <- obj[["anl"]]
379379

380-
if (!is.factor(anl[[merged$merge_vars()$regressor]])) {
380+
if (!is.factor(anl[[merged$variables()$regressor]])) {
381381
shinyjs::show("size")
382382
shinyjs::show("alpha")
383383
plot <- substitute(
384384
expr = ggplot2::ggplot(fit$model[, 2:1], ggplot2::aes_string(regressor, response)) +
385385
ggplot2::geom_point(size = size, alpha = alpha) +
386386
ggplot2::stat_smooth(method = "lm", formula = y ~ x, se = FALSE),
387387
env = list(
388-
regressor = merged$merge_vars()$regressor,
389-
response = merged$merge_vars()$response,
388+
regressor = merged$variables()$regressor,
389+
response = merged$variables()$response,
390390
size = input$size,
391391
alpha = input$alpha
392392
)
@@ -403,7 +403,7 @@ srv_a_regression.picks <- function(id,
403403
plot <- substitute(
404404
expr = ggplot2::ggplot(fit$model[, 2:1], ggplot2::aes_string(regressor, response)) +
405405
ggplot2::geom_boxplot(),
406-
env = list(regressor = merged$merge_vars()$regressor, response = merged$merge_vars()$response)
406+
env = list(regressor = merged$variables()$regressor, response = merged$variables()$response)
407407
)
408408
if (input$show_outlier) {
409409
plot <- substitute(
@@ -420,8 +420,8 @@ srv_a_regression.picks <- function(id,
420420
module_plot = teal.widgets::ggplot2_args(
421421
labs = list(
422422
title = "Response vs Regressor",
423-
x = varname_w_label(merged$merge_vars()$regressor, anl),
424-
y = varname_w_label(merged$merge_vars()$response, anl)
423+
x = varname_w_label(merged$variables()$regressor, anl),
424+
y = varname_w_label(merged$variables()$response, anl)
425425
),
426426
theme = list()
427427
)

‎R/tm_g_association_picks.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ ui_g_association.picks <- function(id,
102102
tags$label("Encodings", class = "text-primary"),
103103
teal::teal_nav_item(
104104
label = tags$strong("Reference variable"),
105-
teal.transform::module_input_ui(id = ns("ref"), spec = ref)
105+
teal.transform::picks_ui(id = ns("ref"), spec = ref)
106106
),
107107
teal::teal_nav_item(
108108
label = tags$strong("Associated variables"),
109-
teal.transform::module_input_ui(id = ns("vars"), spec = vars)
109+
teal.transform::picks_ui(id = ns("vars"), spec = vars)
110110
),
111111
checkboxInput(ns("association"), "Association with reference variable", value = show_association),
112112
checkboxInput(ns("show_dist"), "Scaled frequencies", value = FALSE),
@@ -157,7 +157,7 @@ srv_g_association.picks <- function(id,
157157
moduleServer(id, function(input, output, session) {
158158
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
159159

160-
selectors <- teal.transform::module_input_srv(spec = list(ref = ref, vars = vars), data = data)
160+
selectors <- teal.transform::picks_srv(spec = list(ref = ref, vars = vars), data = data)
161161

162162
validated_q <- reactive({
163163
obj <- req(data())
@@ -191,8 +191,8 @@ srv_g_association.picks <- function(id,
191191
req(merged$data())
192192
logger::log_debug("srv_g_association@1 recalculating a plot")
193193
anl <- merged$data()[["anl"]]
194-
ref_name <- merged$merge_vars()$ref
195-
vars_names <- merged$merge_vars()$vars
194+
ref_name <- merged$variables()$ref
195+
vars_names <- merged$variables()$vars
196196
teal::validate_has_data(anl, 3)
197197
teal::validate_has_data(anl[, c(ref_name, vars_names)], 3, complete = TRUE, allow_inf = FALSE)
198198

‎R/tm_g_bivariate_picks.R‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ ui_g_bivariate.picks <- function(id,
151151
encoding = shiny::tagList(
152152
teal::teal_nav_item(
153153
label = tags$strong("X variable"),
154-
teal.transform::module_input_ui(id = ns("x"), spec = x)
154+
teal.transform::picks_ui(id = ns("x"), spec = x)
155155
),
156156
teal::teal_nav_item(
157157
label = tags$strong("Y variable"),
158-
teal.transform::module_input_ui(id = ns("y"), spec = y)
158+
teal.transform::picks_ui(id = ns("y"), spec = y)
159159
),
160160
conditionalPanel(
161161
condition =
@@ -176,7 +176,7 @@ ui_g_bivariate.picks <- function(id,
176176
teal::teal_nav_item(
177177
tags$div(
178178
tags$strong("Row facetting variable"),
179-
teal.transform::module_input_ui(id = ns("row_facet"), spec = row_facet),
179+
teal.transform::picks_ui(id = ns("row_facet"), spec = row_facet),
180180
checkboxInput(ns("free_x_scales"), "free x scales", value = free_x_scales)
181181
)
182182
)
@@ -185,7 +185,7 @@ ui_g_bivariate.picks <- function(id,
185185
teal::teal_nav_item(
186186
tags$div(
187187
tags$strong("Column facetting variable"),
188-
teal.transform::module_input_ui(id = ns("col_facet"), spec = col_facet),
188+
teal.transform::picks_ui(id = ns("col_facet"), spec = col_facet),
189189
checkboxInput(ns("free_y_scales"), "free y scales", value = free_y_scales)
190190
)
191191
)
@@ -199,11 +199,11 @@ ui_g_bivariate.picks <- function(id,
199199
conditionalPanel(
200200
condition = paste0("input['", ns("coloring"), "']"),
201201
tags$div(
202-
teal.transform::module_input_ui(id = ns("color"), spec = color), # label = "Outline color by variable"
203-
teal.transform::module_input_ui(id = ns("fill"), spec = fill), # label = "Outline color by variable"
202+
teal.transform::picks_ui(id = ns("color"), spec = color), # label = "Outline color by variable"
203+
teal.transform::picks_ui(id = ns("fill"), spec = fill), # label = "Outline color by variable"
204204
tags$div(
205205
id = ns("size_settings"),
206-
teal.transform::module_input_ui(id = ns("size"), spec = size) # label = "Size of points by variable (only if x and y are numeric)"
206+
teal.transform::picks_ui(id = ns("size"), spec = size) # label = "Size of points by variable (only if x and y are numeric)"
207207
)
208208
)
209209
)
@@ -270,7 +270,7 @@ srv_g_bivariate.picks <- function(id,
270270
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
271271

272272
ns <- session$ns
273-
selectors <- teal.transform::module_input_srv(
273+
selectors <- teal.transform::picks_srv(
274274
spec = list(
275275
x = x,
276276
y = y,
@@ -317,13 +317,13 @@ srv_g_bivariate.picks <- function(id,
317317
teal::validate_has_data(anl, 3)
318318

319319

320-
x_name <- merged$merge_vars()$x
321-
y_name <- merged$merge_vars()$y
322-
row_facet_name <- merged$merge_vars()$row_facet
323-
col_facet_name <- merged$merge_vars()$col_facet
324-
color_name <- merged$merge_vars()$color
325-
fill_name <- merged$merge_vars()$fill
326-
size_name <- merged$merge_vars()$size
320+
x_name <- merged$variables()$x
321+
y_name <- merged$variables()$y
322+
row_facet_name <- merged$variables()$row_facet
323+
col_facet_name <- merged$variables()$col_facet
324+
color_name <- merged$variables()$color
325+
fill_name <- merged$variables()$fill
326+
size_name <- merged$variables()$size
327327

328328
use_density <- input$use_density == "density"
329329
free_x_scales <- input$free_x_scales
@@ -440,8 +440,8 @@ srv_g_bivariate.picks <- function(id,
440440
decorators = select_decorators(decorators, "plot"),
441441
expr = reactive({
442442
anl <- merged$data()[["anl"]]
443-
row_facet_name <- merged$merge_vars()$row_facet
444-
col_facet_name <- merged$merge_vars()$col_facet
443+
row_facet_name <- merged$variables()$row_facet
444+
col_facet_name <- merged$variables()$col_facet
445445

446446
# Add labels to facets
447447
nulled_row_facet_name <- varname_w_label(row_facet_name, anl)

‎R/tm_g_distribution.R‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ srv_g_distribution.default <- function(id,
572572
}
573573

574574
ANL <- merged$anl_q_r()[["ANL"]]
575-
round(get_dist_params(as.numeric(stats::na.omit(ANL[[merge_vars()$dist_var]])), input$t_dist), 2)
575+
round(get_dist_params(as.numeric(stats::na.omit(ANL[[variables()$dist_var]])), input$t_dist), 2)
576576
} else {
577577
c("param1" = NA_real_, "param2" = NA_real_)
578578
}
@@ -642,13 +642,13 @@ srv_g_distribution.default <- function(id,
642642
)
643643

644644
ANL <- obj[["ANL"]]
645-
dist_var <- merge_vars()$dist_var
646-
s_var <- merge_vars()$s_var
647-
g_var <- merge_vars()$g_var
645+
dist_var <- variables()$dist_var
646+
s_var <- variables()$s_var
647+
g_var <- variables()$g_var
648648

649-
dist_var_name <- merge_vars()$dist_var_name
650-
s_var_name <- merge_vars()$s_var_name
651-
g_var_name <- merge_vars()$g_var_name
649+
dist_var_name <- variables()$dist_var_name
650+
s_var_name <- variables()$s_var_name
651+
g_var_name <- variables()$g_var_name
652652

653653
roundn <- input$roundn
654654
dist_param1 <- input$dist_param1
@@ -780,12 +780,12 @@ srv_g_distribution.default <- function(id,
780780
is.null(input$ggtheme)
781781
},
782782
valueExpr = {
783-
dist_var <- merge_vars()$dist_var
784-
s_var <- merge_vars()$s_var
785-
g_var <- merge_vars()$g_var
786-
dist_var_name <- merge_vars()$dist_var_name
787-
s_var_name <- merge_vars()$s_var_name
788-
g_var_name <- merge_vars()$g_var_name
783+
dist_var <- variables()$dist_var
784+
s_var <- variables()$s_var
785+
g_var <- variables()$g_var
786+
dist_var_name <- variables()$dist_var_name
787+
s_var_name <- variables()$s_var_name
788+
g_var_name <- variables()$g_var_name
789789
t_dist <- input$t_dist
790790
dist_param1 <- input$dist_param1
791791
dist_param2 <- input$dist_param2
@@ -976,12 +976,12 @@ srv_g_distribution.default <- function(id,
976976
input$tabs
977977
},
978978
valueExpr = {
979-
dist_var <- merge_vars()$dist_var
980-
s_var <- merge_vars()$s_var
981-
g_var <- merge_vars()$g_var
982-
dist_var_name <- merge_vars()$dist_var_name
983-
s_var_name <- merge_vars()$s_var_name
984-
g_var_name <- merge_vars()$g_var_name
979+
dist_var <- variables()$dist_var
980+
s_var <- variables()$s_var
981+
g_var <- variables()$g_var
982+
dist_var_name <- variables()$dist_var_name
983+
s_var_name <- variables()$s_var_name
984+
g_var_name <- variables()$g_var_name
985985
dist_param1 <- input$dist_param1
986986
dist_param2 <- input$dist_param2
987987

@@ -1110,13 +1110,13 @@ srv_g_distribution.default <- function(id,
11101110
# Create a private stack for this function only.
11111111
ANL <- common_q()[["ANL"]]
11121112

1113-
dist_var <- merge_vars()$dist_var
1114-
s_var <- merge_vars()$s_var
1115-
g_var <- merge_vars()$g_var
1113+
dist_var <- variables()$dist_var
1114+
s_var <- variables()$s_var
1115+
g_var <- variables()$g_var
11161116

1117-
dist_var_name <- merge_vars()$dist_var_name
1118-
s_var_name <- merge_vars()$s_var_name
1119-
g_var_name <- merge_vars()$g_var_name
1117+
dist_var_name <- variables()$dist_var_name
1118+
s_var_name <- variables()$s_var_name
1119+
g_var_name <- variables()$g_var_name
11201120

11211121
dist_param1 <- input$dist_param1
11221122
dist_param2 <- input$dist_param2

0 commit comments

Comments
 (0)