merge

Merge branch 'master' into moreFunctions

Conflicts:
	R/sankeyNetwork.R

Author: jjallaire

DESCRIPTION

@@ -5,7 +5,7 @@ Title: Tools for creating D3 JavaScript network, tree, dendrogram, and Sankey
 Description: This packages is intended to make it easy to create D3 JavaScript
     network, tree, dendrogram, and Sankey graphs from R using data frames.
 Version: 0.7.0
-Date: 2014-08-13
+Date: 2014-08-15
 Author: Christopher Gandrud and J.J. Allaire
 Maintainer: Christopher Gandrud <christopher.gandrud@gmail.com>
 URL: http://github.com/christophergandrud/networkD3/

NAMESPACE

@@ -6,17 +6,12 @@ export(forceNetworkOutput)
 export(renderForceNetwork)
 export(renderSankeyNetwork)
 export(renderSimpleNetwork)
-export(renderTreeNetwork)
 export(sankeyNetwork)
 export(sankeyNetworkOutput)
 export(saveNetwork)
 export(simpleNetwork)
 export(simpleNetworkOutput)
-export(treeNetwork)
-export(treeNetworkOutput)
 importFrom(htmlwidgets,shinyRenderWidget)
 importFrom(htmlwidgets,shinyWidgetOutput)
 importFrom(plyr,ldply)
 importFrom(rjson,fromJSON)
-importFrom(rjson,toJSON)
-importFrom(whisker,whisker.render)

NEWS

@@ -0,0 +1,6 @@
+## Version 0.7
+
+- `sankeyNetwork` added.
+
+- `colourScale` argument added to `forceNetwork` and `sankeyNetwork` to allow
+the user to change the node colour scale.

R/forceNetwork.R

@@ -20,6 +20,9 @@
 #' \code{Nodes} data frame.
 #' @param height numeric height for the network graph's frame area in pixels.
 #' @param width numeric width for the network graph's frame area in pixels.
+#' @param colourScale character string specifying the categorical colour
+#' scale for the nodes. See
+#' \url{https://github.com/mbostock/d3/wiki/Ordinal-Scales}.
 #' @param fontsize numeric font size in pixels for the node text labels.
 #' @param linkDistance numeric or character string. Either numberic fixed
 #' distance between the links in pixels (actually arbitrary relative to the
@@ -71,7 +74,8 @@
 #'
 #' @export
 forceNetwork <- function(Links, Nodes, Source, Target, Value, NodeID,
-    Group, height = NULL, width = NULL, fontsize = 7, linkDistance = 50,
+    Group, height = NULL, width = NULL, colourScale = "d3.scale.category20()",
+    fontsize = 7, linkDistance = 50,
     linkWidth = "function(d) { return Math.sqrt(d.value); }", charge = -120,
     linkColour = "#666",opacity = 0.6, zoom = FALSE)
 {
@@ -97,6 +101,7 @@ forceNetwork <- function(Links, Nodes, Source, Target, Value, NodeID,
     options = list(
         NodeID = NodeID,
         Group = Group,
+        colourScale = colourScale,
         fontsize = fontsize,
         clickTextSize = fontsize * 2.5,
         linkDistance = linkDistance,

R/sankeyNetwork.R

@@ -18,6 +18,10 @@
 #' data frame.
 #' @param height numeric height for the network graph's frame area in pixels.
 #' @param width numeric width for the network graph's frame area in pixels.
+#' @param colourScale character string specifying the categorical colour
+#' scale for the nodes. See
+#' \url{https://github.com/mbostock/d3/wiki/Ordinal-Scales}.
+#' @param fontsize numeric font size in pixels for the node text labels.
 #' @param nodeWidth numeric width of each node.
 #' @param nodePadding numeric essentially influences the width height.
 #'
@@ -43,7 +47,8 @@
 #' @export
 
 sankeyNetwork <- function(Links, Nodes, Source, Target, Value, NodeID,
-    height = NULL, width = NULL, fontsize = 7, nodeWidth = 15, nodePadding = 10)
+    height = NULL, width = NULL, colourScale = "d3.scale.category20()",
+    fontsize = 7, nodeWidth = 15, nodePadding = 10)
 {
     # Subset data frames for network graph
     if (class(Links) != "data.frame"){
@@ -66,6 +71,7 @@ sankeyNetwork <- function(Links, Nodes, Source, Target, Value, NodeID,
     # create options
     options = list(
         NodeID = NodeID,
+        colourScale = colourScale,
         fontsize = fontsize,
         nodeWidth = nodeWidth,
         nodePadding = nodePadding

R/treeNetwork.R

@@ -1,5 +1,7 @@
 # Tools for creating D3 JavaScript network graphs from R
 
+Version 0.7
+
 This is a port of Christopher Gandrud's
 [d3Network](http://christophergandrud.github.io/d3Network/) package to the
 [htmlwidgets](https://github.com/ramnathv/htmlwidgets) framework.
@@ -38,7 +40,8 @@ data(MisNodes)
 # Plot
 forceNetwork(Links = MisLinks, Nodes = MisNodes, Source = "source",
              Target = "target", Value = "value", NodeID = "name",
-             Group = "group", opacity = 0.4)
+             Group = "group", opacity = 0.4,
+             colourScale = "d3.scale.category20b()")
 ```
 
 Here's `sankeyNetwork` using a downloaded JSON data file:

README.md

@@ -35,7 +35,7 @@ HTMLWidgets.widget({
     var width = el.offsetWidth;
     var height = el.offsetHeight;
 
-    var color = d3.scale.category20();
+    var color = eval(options.colourScale);
 
     // create d3 force layout
     force
@@ -82,7 +82,15 @@ HTMLWidgets.widget({
       .attr("class", "link")
       .style("stroke", options.linkColour)
       .style("opacity", options.opacity)
-      .style("stroke-width", eval("(" + options.linkWidth + ")"));
+      .style("stroke-width", eval("(" + options.linkWidth + ")"))
+      .on("mouseover", function(d) {
+          d3.select(this)
+            .style("opacity", 1);
+      })
+      .on("mouseout", function(d) {
+          d3.select(this)
+            .style("opacity", options.opacity);
+      });
 
     // draw nodes
     var node = svg.selectAll(".node")

inst/htmlwidgets/forceNetwork.js

@@ -42,7 +42,7 @@ HTMLWidgets.widget({
         var width = el.offsetWidth;
         var height = el.offsetHeight;
 
-        var color = d3.scale.category20();
+        var color = eval(options.colourScale);
 
         var formatNumber = d3.format(",.0f"),
         format = function(d) { return formatNumber(d); }