提交 255c69b3 编写于 作者: L lang

chord: fix kwargsjs在压缩后造成的参数名改变问题, fix IE8 fill rule

上级 0c960fc8
#!/bin/bash
node r.js -o build.js
node r.js -o build-original.js
node r.js -o build-map.js
node r.js -o build-original-map.js
\ No newline at end of file
......@@ -173,9 +173,9 @@ define(function(require) {
case 'ascending':
case 'descending':
var groupIndices = groupAngles
.argsort({order : sortGroups});
groupAngles.sort({order : sortGroups});
sumOut.sort({order : sortGroups});
.argsort(0, sortGroups);
groupAngles['sort'](0, sortGroups);
sumOut['sort'](0, sortGroups);
break;
default:
var groupIndices = NDArray.range(shape[0]);
......@@ -185,8 +185,8 @@ define(function(require) {
case 'ascending':
case 'descending':
var subGroupIndices = subGroupAngles
.argsort(1, {order : sortSubGroups});
subGroupAngles.sort(1, {order : sortSubGroups});
.argsort(1, sortSubGroups);
subGroupAngles['sort'](1, sortSubGroups);
break;
default:
var subGroupIndices = NDArray
......@@ -368,7 +368,6 @@ define(function(require) {
var group = groups[i];
var angle = angles[i];
var _start = (clockWise ? (360 - angle[1]) : angle[0])
+ startAngle;
var _end = (clockWise ? (360 - angle[0]) : angle[1])
......@@ -502,9 +501,11 @@ define(function(require) {
var color;
if (len2 === 1) {
color = angleIJ1 - angleIJ0 < angleJI1 - angleJI0
? getColor(groups[i].name)
: getColor(groups[j].name);
if (angleIJ1 - angleIJ0 <= angleJI1 - angleJI0) {
color = getColor(groups[i].name);
} else {
color = getColor(groups[j].name);
}
} else {
color = getColor(chordSeries[k].name);
}
......
......@@ -111,6 +111,11 @@ define(function(require) {
(cy - ty0) * 0.70 + ty0,
tx0, ty0
);
// Chord to self
if (style.source0 === style.target0 &&
style.source1 === style.target1) {
return;
}
ctx.arc(cx, cy, style.r, t0, t1, false);
ctx.bezierCurveTo(
(cx - tx1) * 0.70 + tx1,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册