add d3.trail() #168
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| export {default as arc} from "./arc.js"; | ||
| export {default as area} from "./area.js"; | ||
| export {default as line} from "./line.js"; | ||
| export {default as trail} from "./trail.js"; | ||
| export {default as pie} from "./pie.js"; | ||
| export {default as areaRadial, default as radialArea} from "./areaRadial.js"; // Note: radialArea is deprecated! | ||
| export {default as lineRadial, default as radialLine} from "./lineRadial.js"; // Note: radialLine is deprecated! | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,7 @@ export function x(p) { | |
| export function y(p) { | ||
| return p[1]; | ||
| } | ||
|
|
||
| export function z(p){ | ||
| return p[2]; | ||
| } | ||
|
wyhleonard marked this conversation as resolved.
Outdated
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| import {path} from "d3-path"; | ||
| import constant from "./constant.js"; | ||
| import {x as pointX, y as pointY, z as pointSize} from "./point.js"; | ||
| import {abs, atan2, cos, pi, tau, sin, sqrt, max, min} from "./math.js"; | ||
|
|
||
| export default function(x, y, size){ | ||
| var defined = constant(true), | ||
|
wyhleonard marked this conversation as resolved.
Outdated
|
||
| context = null, | ||
| ready, | ||
| ready2, | ||
| scaleRatio_min = 1, | ||
| ct1, | ||
| px1, py1, pr1; | ||
|
|
||
| x = typeof x === "function" ? x : (x === undefined) ? pointX : constant(x); | ||
| y = typeof y === "function" ? y : (y === undefined) ? pointY : constant(y); | ||
| size = typeof size === "function" ? size : (size === undefined) ? pointSize : constant(size); | ||
|
|
||
| function crossProduct(x1, y1, x2, y2){ | ||
| return x1*y2 - x2*y1; | ||
| } | ||
|
wyhleonard marked this conversation as resolved.
Outdated
|
||
|
|
||
| function isIntersect(x1, y1, x2, y2, x3, y3, x4, y4){ | ||
| //rapid repulsion | ||
| if(max(x3, x4) < min(x1, x2) || max(y3, y4) < min(y1, y2) || max(x1, x2) < min(x3, x4) || max(y1, y2) < min(y3, y4)){ | ||
| return false; | ||
| } | ||
| //straddle experiment | ||
| if(crossProduct(x1 - x4, y1 - y4, x3 - x4, y3 - y4)*crossProduct(x2 - x4, y2 - y4, x3 - x4, y3 - y4) > 0 || | ||
| crossProduct(x3 - x2, y3 - y2, x1 - x2, y1 - y2)*crossProduct(x4 - x2, y4 - y2, x1 - x2, y1 - y2) > 0){ | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| function intersectPoint(x1, y1, x2, y2, x3, y3, x4, y4){ | ||
| var d1 = abs(crossProduct(x4 - x3, y4 - y3, x1 - x3, y1 - y3)), | ||
| d2 = abs(crossProduct(x4 - x3, y4 - y3, x2 - x3, y2 - y3)), | ||
| t = d1 / (d1 + d2); | ||
|
wyhleonard marked this conversation as resolved.
Outdated
|
||
|
|
||
| return { | ||
| x: x1 + (x2 - x1)*t, | ||
| y: y1 + (y2 - y1)*t | ||
| }; | ||
| } | ||
|
|
||
| function commonTangent(x1, y1, w1, x2, y2, w2){ | ||
| var r1 = w1 / 2, | ||
| r2 = w2 / 2, | ||
| alpha, //the smallest angle in right-angled trapezoid | ||
| alpha_x, | ||
| alpha_y, | ||
| beta, //the slope of line segment | ||
| cos_x, | ||
| sin_y; | ||
|
|
||
| alpha_x = abs(r2 - r1); | ||
| alpha_y = sqrt((x1 - x2)*(x1 - x2) + (y1 - y2)*(y1 - y2) - alpha_x*alpha_x); | ||
| alpha = atan2(alpha_y, alpha_x); | ||
| beta = atan2(y2 - y1, x2 - x1); | ||
|
|
||
| if(r1 < r2){ | ||
| cos_x = -cos(alpha + beta); | ||
| sin_y = -sin(alpha + beta); | ||
|
|
||
| return { | ||
| sg1_x: x1 + r1*cos_x, | ||
| sg1_y: y1 + r1*sin_y, | ||
| sg2_x: x2 + r2*cos_x, | ||
| sg2_y: y2 + r2*sin_y, | ||
| angle: alpha + beta - pi | ||
| }; | ||
| } | ||
| else{ | ||
| cos_x = cos(beta - alpha); | ||
| sin_y = sin(beta - alpha); | ||
|
|
||
| return { | ||
| sg1_x: x1 + r1*cos_x, | ||
| sg1_y: y1 + r1*sin_y, | ||
| sg2_x: x2 + r2*cos_x, | ||
| sg2_y: y2 + r2*sin_y, | ||
| angle: beta - alpha | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| function segment(x1, y1, w1, x2, y2, w2){ | ||
| var ct2 = commonTangent(x1, y1, w1, x2, y2, w2); | ||
|
|
||
| if(ready){ | ||
| if(isIntersect(ct1.sg1_x, ct1.sg1_y, ct1.sg2_x, ct1.sg2_y, ct2.sg1_x, ct2.sg1_y, ct2.sg2_x, ct2.sg2_y)){ | ||
| var p = intersectPoint(ct1.sg1_x, ct1.sg1_y, ct1.sg2_x, ct1.sg2_y, ct2.sg1_x, ct2.sg1_y, ct2.sg2_x, ct2.sg2_y); | ||
|
|
||
| context.lineTo(p.x, p.y); | ||
| } | ||
| else{ | ||
| context.lineTo(ct1.sg2_x, ct1.sg2_y); | ||
| context.arc(x1, y1, w1 / 2, ct1.angle, ct2.angle, 0); | ||
| } | ||
| } | ||
| else{ | ||
| ready = 1; | ||
| context.moveTo(ct2.sg1_x, ct2.sg1_y); | ||
| } | ||
| ct1 = ct2; | ||
| } | ||
|
|
||
| function scaleRatio(px2, py2, pw2){ | ||
| var pr2 = pw2 / 2; | ||
|
|
||
| if(ready2){ | ||
| var lxy = sqrt((px1 - px2)*(px1 - px2) + (py1 - py2)*(py1 - py2)); | ||
| if(pr1 + pr2 > lxy){ | ||
| var sr = lxy / (pr1 + pr2); | ||
| if(sr < scaleRatio_min){ | ||
| scaleRatio_min = sr; | ||
| } | ||
| } | ||
| } | ||
| else{ | ||
| ready2 = 1; | ||
| } | ||
| px1 = px2; | ||
| py1 = py2; | ||
| pr1 = pr2; | ||
| } | ||
|
|
||
| function trail(data){ | ||
| var i, | ||
| n = data.length, | ||
| d, | ||
| def, | ||
| s, | ||
| defined0 = false, | ||
| defined1 = false, | ||
| buffer; | ||
|
|
||
| //make global optimization for radius when r1 + r2 > lxy | ||
| for(i = 0; i < n; i++){ | ||
| def = defined(d = data[i], i, data) && (s = +size(d, i, data)); | ||
| if(!(i < n && def) === defined1){ | ||
| if (defined1 = !defined1) ready2 = 0; | ||
| } | ||
| if(defined1) { | ||
| scaleRatio(+x(d, i, data), +y(d, i, data), s); | ||
| } | ||
| } | ||
|
|
||
| if(context == null) context = buffer = path(); | ||
|
|
||
| var start, | ||
| j, | ||
| d1, | ||
| def1, | ||
| s1, | ||
| tag = false; | ||
|
|
||
| for(i = 0; i < n; i++){ | ||
| def = defined(d = data[i], i, data) && (s = +size(d, i, data)); | ||
| if(!(i < n && def) === defined0){ | ||
| if(defined0 = !defined0){ | ||
| ready = 0; | ||
| start = i; | ||
| } | ||
| } | ||
| if(defined0){ | ||
| j = i + 1; | ||
| if(j < n){ | ||
| def1 = defined(d1 = data[j], j, data) && (s1 = +size(d1, j, data)); | ||
| if(def1){ | ||
| segment(+x(d, i, data), +y(d, i, data), s*scaleRatio_min, +x(d1, j, data), +y(d1, j, data), s1*scaleRatio_min); | ||
| } | ||
| else{ | ||
| tag = true; | ||
| } | ||
| } | ||
| else{ | ||
| tag = true; | ||
| } | ||
| if(tag){ | ||
| j = i - 1; | ||
| if(j < start){ | ||
| var tx = +x(d, i, data), | ||
| ty = +y(d, i, data), | ||
| ts = +size(d, i, data); | ||
|
|
||
| context.moveTo(tx + ts*scaleRatio_min / 2, ty); | ||
| context.arc(tx, ty, ts*scaleRatio_min / 2, 0, tau, 0); | ||
| context.closePath(); | ||
| } | ||
| else{ | ||
| while(j >= start){ | ||
| d1 = data[j]; | ||
| segment(+x(d, j + 1, data), +y(d, j + 1, data), +size(d, j + 1, data)*scaleRatio_min, +x(d1, j, data), +y(d1, j, data), +size(d1, j, data)*scaleRatio_min); | ||
| d = d1; | ||
| j -= 1; | ||
| } | ||
| j += 1; | ||
| d1 = data[j + 1]; | ||
| segment(+x(d, j, data), +y(d, j, data), +size(d, j, data)*scaleRatio_min, +x(d1, j + 1, data), +y(d1, j + 1, data), +size(d1, j + 1, data)*scaleRatio_min); | ||
|
|
||
| context.closePath(); | ||
| } | ||
| tag = false; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if(buffer){ | ||
| context = null; | ||
| return buffer + '' || null; | ||
|
wyhleonard marked this conversation as resolved.
Outdated
|
||
| } | ||
| } | ||
|
|
||
| trail.x = function(_){ | ||
| return arguments.length ? (x = typeof _ === "function" ? _ : constant(+_), trail) : x; | ||
| }; | ||
|
|
||
| trail.y = function(_){ | ||
| return arguments.length ? (y = typeof _ === "function" ? _ : constant(+_), trail) : y; | ||
| }; | ||
|
|
||
| trail.size = function(_){ | ||
| return arguments.length ? (size = typeof _ === "function" ? _ : constant(+_), trail) : size; | ||
| }; | ||
|
|
||
| trail.defined = function(_){ | ||
| return arguments.length ? (defined = typeof _ === "function" ? _ : constant(!!_), trail) : defined; | ||
| }; | ||
|
|
||
| trail.context = function(_){ | ||
| return arguments.length ? ((context = _ == null ? null : _), trail) : context; | ||
| }; | ||
|
|
||
| return trail; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.