Merge branch 'eliztang-dev' into dev

mattflor · Jul 11, 2016 · bf2748c · bf2748c
2 parents eb320e4 + 81f701a
commit bf2748c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/R/chorddiag.R b/R/chorddiag.R
@@ -105,7 +105,8 @@ chorddiag <- function(data,
                       tooltipUnit = NULL,
                       tooltipFontsize = 12,
                       tooltipGroupConnector = " &#x25B6; ",
-                      precision = NULL) {
+                      precision = NULL,
+                      clickAction = NULL) {
 
     if (!is.matrix(data))
         stop("'data' must be a matrix class object.")
@@ -206,7 +207,8 @@ chorddiag <- function(data,
                                  tooltipFontsize = tooltipFontsize,
                                  tooltipUnit = tooltipUnit,
                                  tooltipGroupConnector = tooltipGroupConnector,
-                                 precision = precision))
+                                 precision = precision,
+                                 clickAction = clickAction))
     params = Filter(Negate(is.null), params)
 
     # create widget

diff --git a/inst/examples/shiny/server.R b/inst/examples/shiny/server.R
@@ -19,6 +19,12 @@ shinyServer(function(input, output) {
                   groupColors = groupColors,
                   groupnamePadding = input$groupnamePadding,
                   showTicks = input$showTicks,
-                  margin = input$margin)
+                  margin = input$margin,
+                  clickAction = "Shiny.onInputChange('sourceIndex', d.source.index+1);
+                                Shiny.onInputChange('targetIndex', d.target.index+1);")
     )
+
+    output$shiny_return <- renderPrint({
+        paste0(groupNames[input$sourceIndex], " <-> ", groupNames[input$targetIndex])
+    })
 })
diff --git a/inst/examples/shiny/ui.R b/inst/examples/shiny/ui.R
@@ -12,7 +12,8 @@ shinyUI(fluidPage(
         ),
 
         mainPanel(
-            chorddiagOutput('chorddiag', height = '600px')
+            chorddiagOutput('chorddiag', height = '600px'),
+            verbatimTextOutput("shiny_return")
         )
     )
 ))
diff --git a/inst/htmlwidgets/chorddiag.js b/inst/htmlwidgets/chorddiag.js
@@ -217,7 +217,8 @@ HTMLWidgets.widget({
           .on("mouseout", function(d) {
               if (showTooltips) chordTip.hide(d);
               return chordFade(d, 1);
-          });
+          })
+          .on("click", click);
 
     // create group labels
     if (showGroupnames) {
@@ -338,6 +339,10 @@ HTMLWidgets.widget({
         var mult = Math.pow(10, sig - Math.floor(Math.log(n) / Math.LN10) - 1);
         return Math.round(n * mult) / mult;
     }
+
+    function click(d) {
+      return eval(options.clickAction);
+    }
 
   }  // end renderValue function
 

diff --git a/man/chorddiag.Rd b/man/chorddiag.Rd
diff --git a/vignettes/chorddiagram-vignette.Rmd b/vignettes/chorddiagram-vignette.Rmd
@@ -114,12 +114,12 @@ First, we create a contingency table of how many passengers from the different c
 
 ```{r, fig.width = 8, warning = FALSE, message = FALSE}
 library(dplyr)
-titanic_tbl <- dplyr::tbl_dt(Titanic)
+titanic_tbl <- dplyr::tbl_df(Titanic)
 titanic_tbl <- titanic_tbl %>%
     mutate_each(funs(factor), Class:Survived)
 by_class_survival <- titanic_tbl %>%
     group_by(Class, Survived) %>%
-    summarize(Count = sum(N))
+    summarize(Count = sum(n))
 titanic.mat <- matrix(by_class_survival$Count, nrow = 4, ncol = 2)
 dimnames(titanic.mat ) <- list(Class = levels(titanic_tbl$Class),
                                Survival = levels(titanic_tbl$Survived))