Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

selected rounding of corners in d3.arc() #166

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

selected rounding of corners in d3.arc() #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
add the selected arc corners
  • Loading branch information
@wyhleonard
wyhleonard committed Aug 20, 2020
commit cc331b961f5a176fd70d029cacb3567a2315549d
95 changes: 70 additions & 25 deletions src/arc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ export default function() {
endAngle = arcEndAngle,
padAngle = arcPadAngle,
context = null;
//selected corners - [start or end] - the defalut is true(1)
selectedCorner_s = constant(1),
selectedCorner_e = constant(1);

function arc() {
var buffer,
Expand Down Expand Up @@ -126,7 +129,9 @@ export default function() {
rc0 = rc,
rc1 = rc,
t0,
t1;
t1,
sc_s = +selectedCorner_s.apply(this, arguments),
sc_e = +selectedCorner_e.apply(this, arguments);

// Apply padding? Note that since r1 ≥ r0, da1 ≥ da0.
if (rp > epsilon) {
Expand Down Expand Up @@ -168,21 +173,36 @@ export default function() {
if (!(da1 > epsilon)) context.moveTo(x01, y01);

// Does the sector’s outer ring have rounded corners?
else if (rc1 > epsilon) {
t0 = cornerTangents(x00, y00, x01, y01, r1, rc1, cw);
t1 = cornerTangents(x11, y11, x10, y10, r1, rc1, cw);

context.moveTo(t0.cx + t0.x01, t0.cy + t0.y01);

// Have the corners merged?
if (rc1 < rc) context.arc(t0.cx, t0.cy, rc1, atan2(t0.y01, t0.x01), atan2(t1.y01, t1.x01), !cw);

// Otherwise, draw the two corners and the ring.
else {
else if(rc1 > epsilon){
if(sc_s && sc_e){
t0 = cornerTangents(x00, y00, x01, y01, r1, rc1, cw);
t1 = cornerTangents(x11, y11, x10, y10, r1, rc1, cw);

context.moveTo(t0.cx + t0.x01, t0.cy + t0.y01);

// Have the corners merged?
if (rc1 < rc) context.arc(t0.cx, t0.cy, rc1, atan2(t0.y01, t0.x01), atan2(t1.y01, t1.x01), !cw);
else {
context.arc(t0.cx, t0.cy, rc1, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !cw);
context.arc(0, 0, r1, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), !cw);
context.arc(t1.cx, t1.cy, rc1, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !cw);
}
}
else if(sc_s && !sc_e){
t0 = cornerTangents(x00, y00, x01, y01, r1, rc1, cw);

context.arc(t0.cx, t0.cy, rc1, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !cw);
context.arc(0, 0, r1, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), !cw);
context.arc(0, 0, r1, atan2(t0.cy + t0.y11, t0.cx + t0.x11), a11, !cw);
}
else if(!sc_s && sc_e){
t1 = cornerTangents(x11, y11, x10, y10, r1, rc1, cw);

context.arc(0, 0, r1, a01, atan2(t1.cy + t1.y11, t1.cx + t1.x11), !cw);
context.arc(t1.cx, t1.cy, rc1, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !cw);
}
else{
context.arc(0, 0, r1, a01, a11, !cw);
}
}

// Or is the outer ring just a circular arc?
Expand All @@ -193,20 +213,37 @@ export default function() {
if (!(r0 > epsilon) || !(da0 > epsilon)) context.lineTo(x10, y10);

// Does the sector’s inner ring (or point) have rounded corners?
else if (rc0 > epsilon) {
t0 = cornerTangents(x10, y10, x11, y11, r0, -rc0, cw);
t1 = cornerTangents(x01, y01, x00, y00, r0, -rc0, cw);

context.lineTo(t0.cx + t0.x01, t0.cy + t0.y01);
else if(rc0 > epsilon){
if(sc_s && sc_e){
t0 = cornerTangents(x10, y10, x11, y11, r0, -rc0, cw);
t1 = cornerTangents(x01, y01, x00, y00, r0, -rc0, cw);

context.lineTo(t0.cx + t0.x01, t0.cy + t0.y01);

// Have the corners merged?
if (rc0 < rc) context.arc(t0.cx, t0.cy, rc0, atan2(t0.y01, t0.x01), atan2(t1.y01, t1.x01), !cw);

// Otherwise, draw the two corners and the ring.
else {
context.arc(t0.cx, t0.cy, rc0, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !cw);
context.arc(0, 0, r0, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), cw);
context.arc(t1.cx, t1.cy, rc0, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !cw);
}
}
else if(sc_s && !sc_e){
t1 = cornerTangents(x01, y01, x00, y00, r0, -rc0, cw);

// Have the corners merged?
if (rc0 < rc) context.arc(t0.cx, t0.cy, rc0, atan2(t0.y01, t0.x01), atan2(t1.y01, t1.x01), !cw);
context.arc(0, 0, r0, a10, atan2(t1.cy + t1.y11, t1.cx + t1.x11), cw);
context.arc(t1.cx, t1.cy, rc0, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !cw);
}
else if(!sc_s && sc_e){
t0 = cornerTangents(x10, y10, x11, y11, r0, -rc0, cw);

// Otherwise, draw the two corners and the ring.
else {
context.arc(t0.cx, t0.cy, rc0, atan2(t0.y01, t0.x01), atan2(t0.y11, t0.x11), !cw);
context.arc(0, 0, r0, atan2(t0.cy + t0.y11, t0.cx + t0.x11), atan2(t1.cy + t1.y11, t1.cx + t1.x11), cw);
context.arc(t1.cx, t1.cy, rc0, atan2(t1.y11, t1.x11), atan2(t1.y01, t1.x01), !cw);
context.arc(0, 0, r0, atan2(t0.cy + t0.y11, t0.cx + t0.x11), a00, cw);
}
else{
context.arc(0, 0, r0, a10, a00, cw);
}
}

Expand Down Expand Up @@ -257,5 +294,13 @@ export default function() {
return arguments.length ? ((context = _ == null ? null : _), arc) : context;
};

arc.selectedCorner_s = function(_) {
return arguments.length ? (selectedCorner_s = typeof _ === "function" ? _ : constant(+_), arc) : selectedCorner_s;
};

arc.selectedCorner_e = function(_) {
return arguments.length ? (selectedCorner_e = typeof _ === "function" ? _ : constant(+_), arc) : selectedCorner_e;
};

return arc;
}
}