Skip to content

Commit

Permalink
fixed problem with shiny 1.2, closes #4
Browse files Browse the repository at this point in the history
  • Loading branch information
pfgherardini committed Dec 5, 2018
1 parent a82ea15 commit 0ac9b23
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: panorama
Title: Visualize and compare flow cytometry data
Description: This package is an interactive GUI for visualizing and anlyzing
graphs representing single-cell data
Version: 0.1.0
Version: 0.1.1
Authors@R: "Pier Federico Gherardini <[email protected]> [aut, cre]"
Depends:
License: GPL v3
Expand All @@ -20,4 +20,4 @@ Imports:
stringr,
gplots
LazyData: true
RoxygenNote: 6.0.1
RoxygenNote: 6.1.0
4 changes: 2 additions & 2 deletions R/plot_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ load_clusters_data <- function(clusters, samples, dir.prefix, skip.missing = FAL
ret$sample <- x$samples[1]
return(ret)
})

return(do.call(rbind, ret))


Expand Down Expand Up @@ -133,7 +133,7 @@ plot_clusters <- function(G, clusters, col.names, working.dir, plot.type, pool.c

cl.labels <- V(G)$Label[clusters]
clusters.data <- NULL

if(is.null(V(G)$sample) && is.null(samples.to.plot)) { # Load the pooled data
pooled.data.dir <- tools::file_path_sans_ext(igraph::get.graph.attribute(G, "fname"))
clusters.data <- load_rds_data(cl.labels, file.path(working.dir, "clusters_data", "pooled", pooled.data.dir))
Expand Down
4 changes: 3 additions & 1 deletion inst/shinyGUI/server/tab_graph.R
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,9 @@ output$graphui_viscontrol <- reactive({


observe({
updateSliderInput(session, "graphui_color_scale_lim", min = input$graphui_color_scale_min,
if(!is.null(input$graphui_color_scale_min) &&
!is.null(input$graphui_color_scale_max))
updateSliderInput(session, "graphui_color_scale_lim", min = input$graphui_color_scale_min,
max = input$graphui_color_scale_max)
})

Expand Down
4 changes: 2 additions & 2 deletions man/plot_clusters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0ac9b23

Please sign in to comment.