Skip to content

Commit

Permalink
Improved color relation output
Browse files Browse the repository at this point in the history
  • Loading branch information
agouy committed Nov 12, 2024
1 parent 11401bc commit 24cc286
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion main.R
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,16 @@ if(ctx$hasNumericXAxis) {
out_list <- ctx$select(c(to_select, ".colorLevels")) %>%
bin_data_2d(method = method, n_bins_x = n_bins, n_bins_y = n_bins, group = TRUE)

# use color factors instead of colorLevels
col_relation <- ctx$select(c(ctx$colors, ".colorLevels")) %>%
distinct() %>%
as_relation()

out_rel <- out_list$obs_df %>%
as_relation() %>%
left_join_relation(ctx$crelation, ".ci", ctx$crelation$rids) %>%
left_join_relation(ctx$rrelation, ".ri", ctx$rrelation$rids) %>%
left_join_relation(as_relation(ctx$schema), ".colorLevels", ".colorLevels") %>%
left_join_relation(col_relation, ".colorLevels", ".colorLevels") %>%
left_join_relation(as_relation(out_list$x_df), list(".colorLevels", ".x_bin_id"), list(".x_colorLevels", paste0(ctx$namespace, ".x_bin_id"))) %>%
left_join_relation(as_relation(out_list$y_df), list(".colorLevels", ".y_bin_id"), list(".y_colorLevels", paste0(ctx$namespace, ".y_bin_id"))) %>%
left_join_relation(as_relation(out_list$xy_df), list(".colorLevels", ".xy_bin_id"), list(".xy_colorLevels", paste0(ctx$namespace, ".xy_bin_id"))) %>%
Expand Down

0 comments on commit 24cc286

Please sign in to comment.