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.

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

Fix scallop example vignette #65

Merged
merged 45 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
173eff5
test next zone_summary function call in vignette
Paul-Carvalho Apr 22, 2024
dfa7b34
comment out most of zone_summary for testing
Paul-Carvalho Apr 22, 2024
27fe3c8
restore rbuildignore
Paul-Carvalho Apr 22, 2024
861111b
add data loading in zone_summary
Paul-Carvalho Apr 22, 2024
8f73ad3
comment out all lines except dat and spat setup
Paul-Carvalho Apr 23, 2024
4f75842
keep only dat
Paul-Carvalho Apr 23, 2024
507e151
comment out all code again
Paul-Carvalho Apr 23, 2024
0372976
add data_pull to zone_summary
Paul-Carvalho Apr 23, 2024
46af569
get dataset in zone_summary
Paul-Carvalho Apr 23, 2024
12b7cf6
add parse_data_name to zone_summary
Paul-Carvalho Apr 23, 2024
5a693ba
remove @md in documentation of zone_summary
Paul-Carvalho Apr 23, 2024
6d122b9
move documentation in zone_summary
Paul-Carvalho Apr 23, 2024
10df923
change $ to [[]] in parse_data_name
Paul-Carvalho Apr 23, 2024
5406a0d
restore parse_data_name and comment out second part of problem chunk …
Paul-Carvalho Apr 23, 2024
b8e3a3b
remove rlang::caller_env from parse_data_name
Paul-Carvalho Apr 23, 2024
9c7fa27
add rlang::caller_env back to parse_data_name
Paul-Carvalho Apr 23, 2024
f2bf312
comment out parse_data_name in zone_summary
Paul-Carvalho Apr 23, 2024
955f206
add outlier_table to zone_summary just to check if it will build with…
Paul-Carvalho Apr 23, 2024
13bd486
keep parse_data_name commented out, but try adding spatout data in zo…
Paul-Carvalho Apr 23, 2024
52072a2
check parse_data_name for spat in zone_summary
Paul-Carvalho Apr 23, 2024
f24dfb7
comment out parse_data_name code
Paul-Carvalho Apr 23, 2024
24324ea
testing parse_data_name again
Paul-Carvalho Apr 23, 2024
4eb9378
remove out but keep parse_data_name
Paul-Carvalho Apr 23, 2024
9ca6073
restore parse_data_name and test if error occurs on following chunk i…
Paul-Carvalho Apr 23, 2024
1b7d81b
restore zone_summary
Paul-Carvalho Apr 23, 2024
4d1b306
add summary table
Paul-Carvalho Apr 23, 2024
1023c23
add percent check back in zone_summary
Paul-Carvalho Apr 23, 2024
54813f3
add conf check and merge spat to zone_summary function
Paul-Carvalho Apr 23, 2024
863d262
had to comment out code at the end of zone_summary
Paul-Carvalho Apr 23, 2024
1c0156f
add base_map code back in zone_summary
Paul-Carvalho Apr 23, 2024
4b6dbab
add breaks and z_plot function to zone_summary
Paul-Carvalho Apr 23, 2024
1000f03
needed to add full if statement
Paul-Carvalho Apr 23, 2024
2131788
comment out multiplot code
Paul-Carvalho Apr 23, 2024
d7a8119
add group_zone function in zone_summary
Paul-Carvalho Apr 23, 2024
84726d0
add code after group zone function in zone_summary
Paul-Carvalho Apr 23, 2024
1b3237d
add code in else statement of multiplot in zone_summary
Paul-Carvalho Apr 23, 2024
1dd9960
add rest of multiplot ifelse statement in zone_summary
Paul-Carvalho Apr 23, 2024
f1bb110
keep plotly code and comment our save plot
Paul-Carvalho Apr 23, 2024
04556f7
try using an intermediate var for z_plot in esle statement
Paul-Carvalho Apr 23, 2024
108122f
try adding only ggplotly to else statement
Paul-Carvalho Apr 23, 2024
e5122c9
comment out plotly stuff for testing
Paul-Carvalho Apr 23, 2024
1164b78
uncomment binned assignement in z_plot_fun in zone_summary
Paul-Carvalho Apr 23, 2024
9639a1b
comment out scale for ggplot in z_plot_fun in zone_summary
Paul-Carvalho Apr 23, 2024
350591d
test rest of zone_summary function
Paul-Carvalho Apr 23, 2024
9143054
change color scale for zone_summary to always plot continuous viridis…
Paul-Carvalho Apr 24, 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
44 changes: 22 additions & 22 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -935,37 +935,37 @@ parse_data_name <- function(dat, type, project) {


if (shiny::isRunning()) {

p_set <- get_proj_settings(project)
dat <- p_set$tables[[type]]
} else {

} else {

if (!is.character(dat)) {

if (type == "main") {
dat <- deparse(substitute(dat, rlang::caller_env()))

dat <- deparse(substitute(dat, rlang::caller_env()))

} else if (type == "aux") {
dat <- deparse(substitute(aux, rlang::caller_env()))

dat <- deparse(substitute(aux, rlang::caller_env()))

} else if (type == "grid") {
dat <- deparse(substitute(grid, rlang::caller_env()))

dat <- deparse(substitute(grid, rlang::caller_env()))

} else if (type == "port") {
dat <- deparse(substitute(port, rlang::caller_env()))

dat <- deparse(substitute(port, rlang::caller_env()))

} else if (type == "spat") {
dat <- deparse(substitute(spat, rlang::caller_env()))

dat <- deparse(substitute(spat, rlang::caller_env()))

} else if (type == "outsample") {
dat <- deparse(substitute(outsample, rlang::caller_env()))

dat <- deparse(substitute(outsample, rlang::caller_env()))
}
}
}
Expand Down
Loading
Loading