Skip to content

Commit 3d06452

Browse files
jasondaviesjasondavies
committed
Reverse subpath direction for annulus.
1 parent 69bf26e commit 3d06452

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎d3.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2602,8 +2602,8 @@ d3.svg.arc = function() {
26022602
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
26032603
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
26042604
+ "M0," + r0
2605-
+ "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
2606-
+ "A" + r0 + "," + r0 + " 0 1,1 0," + r0
2605+
+ "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
2606+
+ "A" + r0 + "," + r0 + " 0 1,0 0," + r0
26072607
+ "Z"
26082608
: "M0," + r1
26092609
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)

‎d3.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/svg/arc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ d3.svg.arc = function() {
2121
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
2222
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
2323
+ "M0," + r0
24-
+ "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
25-
+ "A" + r0 + "," + r0 + " 0 1,1 0," + r0
24+
+ "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
25+
+ "A" + r0 + "," + r0 + " 0 1,0 0," + r0
2626
+ "Z"
2727
: "M0," + r1
2828
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)

‎test/svg/arc-test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ suite.addBatch({
120120
},
121121
"draws an annulus when inner radius is non-zero and angle is approximately 2π": function(arc) {
122122
var a = arc().innerRadius(100).outerRadius(200);
123-
assert.pathEqual(a.startAngle(0).endAngle(2 * Math.PI - 1e-9)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,1 0,-100A100,100 0 1,1 0,100Z");
124-
assert.pathEqual(a.startAngle(Math.PI + 1e-9).endAngle(3 * Math.PI - 1e-9)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,1 0,-100A100,100 0 1,1 0,100Z");
123+
assert.pathEqual(a.startAngle(0).endAngle(2 * Math.PI - 1e-9)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,0 0,-100A100,100 0 1,0 0,100Z");
124+
assert.pathEqual(a.startAngle(Math.PI + 1e-9).endAngle(3 * Math.PI - 1e-9)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,0 0,-100A100,100 0 1,0 0,100Z");
125125
},
126126
"draws an annulus when inner radius is non-zero and angle is greater than 2π": function(arc) {
127127
var a = arc().innerRadius(100).outerRadius(200);
128-
assert.pathEqual(a.startAngle(0).endAngle(7)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,1 0,-100A100,100 0 1,1 0,100Z");
129-
assert.pathEqual(a.startAngle(-1).endAngle(6)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,1 0,-100A100,100 0 1,1 0,100Z");
128+
assert.pathEqual(a.startAngle(0).endAngle(7)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,0 0,-100A100,100 0 1,0 0,100Z");
129+
assert.pathEqual(a.startAngle(-1).endAngle(6)(), "M0,200A200,200 0 1,1 0,-200A200,200 0 1,1 0,200M0,100A100,100 0 1,0 0,-100A100,100 0 1,0 0,100Z");
130130
},
131131
"draws an annular sector when both radii are non-zero and angle is less than 2π": function(arc) {
132132
var a = arc().innerRadius(100).outerRadius(200);

0 commit comments

Comments
 (0)