Skip to content

Commit

Permalink
letting automatic faceting for multiple x or y variables be removed
Browse files Browse the repository at this point in the history
updated news
  • Loading branch information
certara-smouksassi committed Jul 17, 2023
1 parent 7e124fd commit 9c132ef
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# ggquickeda 0.3.9999
* rebuilt docs fixed broken link
*
* fixing some regressions introduced by bookmarking
* fixing some errors by the new R rules for logical comparison ||
* fixing error in aspect.ratio not numeric
* fixing other regression with ggpairs color and group
* TBD reduce package size !


# ggquickeda 0.3.0
* added options to drop levels for user discrete shape and linetype scales
Expand Down
28 changes: 14 additions & 14 deletions inst/shinyapp/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -2206,14 +2206,14 @@ function(input, output, session) {
req(values$maindata)
df <-values$maindata
validate(need(!is.null(df), "Please select a data set"))
items <- c("None" = ".", choice_items()[-1]) # Replace 'None' value with 'None' label abd '.' value (for ggplot2 ease)
items <- c("None" = ".", choice_items()[-1]) # Replace 'None' value with 'None' label and '.' value (for ggplot2 ease)
selectInput("facetcolin", "Column Split:", items)
})

output$facet_row <- renderUI({
df <-values$maindata
validate(need(!is.null(df), "Please select a data set"))
items <- c("None" = ".", choice_items()[-1]) # Replace 'None' value with 'None' label abd '.' value (for ggplot2 ease)
items <- c("None" = ".", choice_items()[-1]) # Replace 'None' value with 'None' label and '.' value (for ggplot2 ease)
selectInput("facetrowin", "Row Split:", items)
})

Expand All @@ -2227,12 +2227,12 @@ function(input, output, session) {
if (length(input$x) > 1 ){
items= c("xvars",None=".",items[items!="xvars"])
}
if(!is.null(input$facetcolextrain) && input$facetcolextrain %in% items) {
selected <- items[1]
} else {
selected <- NULL
}
selectInput("facetcolextrain", "Extra Column Split:",items, selected = selected)
# if(!is.null(input$facetcolextrain) && input$facetcolextrain %in% items) {
# selected <- items[1]
# } else {
# selected <- NULL
# }
selectInput("facetcolextrain", "Extra Column Split:",items, selected = items[1])
})

output$facet_row_extra <- renderUI({
Expand All @@ -2245,12 +2245,12 @@ function(input, output, session) {
if (length(input$y) > 1 ){
items= c("yvars",None=".",items[items!="yvars"])
}
if(!is.null(input$facetrowextrain) && input$facetrowextrain %in% items) {
selected <- items[1]
} else {
selected <- NULL
}
selectInput("facetrowextrain", "Extra Row Split:",items, selected = selected)
# if(!is.null(input$facetrowextrain) && input$facetrowextrain %in% items) {
# selected <- items[1]
# } else {
# selected <- NULL
# }
selectInput("facetrowextrain", "Extra Row Split:",items, selected = items[1])
})

output$facetscales <- renderUI({
Expand Down

0 comments on commit 9c132ef

Please sign in to comment.