Permalink
Browse files

Merge branch 'master' of https://github.com/mbostock/d3

  • Loading branch information...
2 parents 2a6573b + 5ae34aa commit 68883f22fb02512902c88328bb3c1c2a0d115d1f John Arthur Morefield committed Nov 10, 2011
Showing with 2,373 additions and 474 deletions.
  1. +1 −0 .gitignore
  2. +5 −1 Makefile
  3. +11 −1 d3.geom.js
  4. +549 −84 d3.js
  5. +21 −18 d3.layout.js
  6. +1 −1 d3.layout.min.js
  7. +2 −2 d3.min.js
  8. +92 −0 examples/brush/brush-x.html
  9. +91 −0 examples/brush/brush-y.html
  10. +98 −0 examples/brush/brush.html
  11. +1 −1 examples/calendar/dji.js
  12. +1 −2 examples/calendar/vix.js
  13. +52 −52 examples/data/us-states.json
  14. +1 −1 examples/donut/donut.html
  15. +1 −7 examples/force/force.js
  16. +407 −0 examples/parallel/cars.csv
  17. +134 −0 examples/parallel/parallel.html
  18. +3 −4 examples/pie/pie-transition.html
  19. +1 −1 examples/pie/pie.html
  20. +0 −7 examples/splom/cross.js
  21. +45 −4 examples/splom/splom.css
  22. +0 −1 examples/splom/splom.html
  23. +96 −126 examples/splom/splom.js
  24. +60 −0 examples/transform/transform.html
  25. +3 −2 examples/zoom-pan/zoom-pan-transform.html
  26. +3 −2 examples/zoom-pan/zoom-pan.html
  27. +4 −3 package.json
  28. +9 −14 src/behavior/drag.js
  29. +41 −15 src/behavior/zoom.js
  30. +1 −1 src/core/core.js
  31. +45 −33 src/core/dispatch.js
  32. +5 −0 src/core/event.js
  33. +21 −0 src/core/extent.js
  34. +9 −6 src/core/interpolate.js
  35. +15 −0 src/core/random.js
  36. +48 −0 src/core/transform.js
  37. +1 −1 src/core/transition-attr.js
  38. +1 −1 src/core/transition-style.js
  39. +7 −6 src/core/transition.js
  40. +11 −1 src/geom/voronoi.js
  41. +6 −3 src/layout/chord.js
  42. +2 −2 src/layout/force.js
  43. +13 −13 src/layout/pie.js
  44. +3 −2 src/package.js
  45. +8 −5 src/scale/ordinal.js
  46. +335 −0 src/svg/brush.js
  47. +3 −2 src/svg/touches.js
  48. +39 −40 test/core/dispatch-test.js
  49. +51 −0 test/core/extent-test.js
  50. +4 −0 test/core/interpolate-test.js
  51. +2 −2 test/core/select-test.js
  52. +2 −2 test/core/selectAll-test.js
  53. +2 −2 test/core/transition-test-each.js
  54. +3 −3 test/scale/category-test.js
  55. +3 −0 test/scale/ordinal-test.js
View
@@ -1,2 +1,3 @@
_site
node_modules
+.DS_Store
View
@@ -48,6 +48,8 @@ d3.core.js: \
src/core/median.js \
src/core/min.js \
src/core/max.js \
+ src/core/extent.js \
+ src/core/random.js \
src/core/number.js \
src/core/sum.js \
src/core/quantile.js \
@@ -118,6 +120,7 @@ d3.core.js: \
src/core/transition-each.js \
src/core/transition-transition.js \
src/core/timer.js \
+ src/core/transform.js \
src/core/noop.js
d3.scale.js: \
@@ -147,7 +150,8 @@ d3.svg.js: \
src/svg/mouse.js \
src/svg/touches.js \
src/svg/symbol.js \
- src/svg/axis.js
+ src/svg/axis.js \
+ src/svg/brush.js
d3.behavior.js: \
src/behavior/behavior.js \
View
@@ -268,14 +268,24 @@ function d3_geom_polygonIntersect(c, d, a, b) {
// http://blog.thejit.org/assets/voronoijs/voronoi.js
// See lib/jit/LICENSE for details.
+// Notes:
+//
+// This implementation does not clip the returned polygons, so if you want to
+// clip them to a particular shape you will need to do that either in SVG or by
+// post-processing with d3.geom.polygon's clip method.
+//
+// If any vertices are coincident or have NaN positions, the behavior of this
+// method is undefined. Most likely invalid polygons will be returned. You
+// should filter invalid points, and consolidate coincident points, before
+// computing the tessellation.
+
/**
* @param vertices [[x1, y1], [x2, y2], …]
* @returns polygons [[[x1, y1], [x2, y2], …], …]
*/
d3.geom.voronoi = function(vertices) {
var polygons = vertices.map(function() { return []; });
- // Note: we expect the caller to clip the polygons, if needed.
d3_voronoi_tessellate(vertices, function(e) {
var s1,
s2,
Oops, something went wrong.

0 comments on commit 68883f2

Please sign in to comment.