Skip to content

Commit 6ba77c6

Browse files
committed
fix contour(carpet) rounded off edgpath constraints contour bug
++ update incorrect baselines added two commits ago.
1 parent 0fe878f commit 6ba77c6

5 files changed

+16
-4
lines changed

Diff for: src/traces/contour/close_boundaries.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,16 @@ module.exports = function(pathinfo, contours) {
5858
}
5959
break;
6060
case '<':
61-
if(contoursValue < boundaryMin) {
61+
if(contoursValue < boundaryMin ||
62+
(!pi0.edgepaths.length && pi0.starts.length && contoursValue === boundaryMin)) {
6263
pi0.prefixBoundary = true;
6364
}
6465
break;
6566
case '[]':
6667
v1 = Math.min(contoursValue[0], contoursValue[1]);
6768
v2 = Math.max(contoursValue[0], contoursValue[1]);
68-
if(v2 < boundaryMin || v1 > boundaryMax) {
69+
if(v2 < boundaryMin || v1 > boundaryMax ||
70+
(!pi0.edgepaths.length && pi0.starts.length && v2 === boundaryMin)) {
6971
pi0.prefixBoundary = true;
7072
}
7173
break;

Diff for: src/traces/contour/convert_to_constraints.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ module.exports = function(pathinfo, operation) {
4141
for(i = 0; i < pi0.paths.length; i++) {
4242
pi0.paths[i] = op0(pi0.paths[i]);
4343
}
44+
for(i = 0; i < pi0.starts.length; i++) {
45+
pi0.starts[i] = op0(pi0.starts[i]);
46+
}
4447

4548
return pathinfo;
4649
case '][':
@@ -65,24 +68,31 @@ module.exports = function(pathinfo, operation) {
6568
for(i = 0; i < pi0.edgepaths.length; i++) {
6669
pi0.edgepaths[i] = op0(pi0.edgepaths[i]);
6770
}
68-
6971
for(i = 0; i < pi0.paths.length; i++) {
7072
pi0.paths[i] = op0(pi0.paths[i]);
7173
}
74+
for(i = 0; i < pi0.starts.length; i++) {
75+
pi0.starts[i] = op0(pi0.starts[i]);
76+
}
7277

7378
while(pi1.edgepaths.length) {
7479
pi0.edgepaths.push(op1(pi1.edgepaths.shift()));
7580
}
7681
while(pi1.paths.length) {
7782
pi0.paths.push(op1(pi1.paths.shift()));
7883
}
84+
while(pi1.starts.length) {
85+
pi0.starts.push(op1(pi1.starts.shift()));
86+
}
87+
7988
return [pi0];
8089
}
8190
};
8291

8392
function copyPathinfo(pi) {
8493
return Lib.extendFlat({}, pi, {
8594
edgepaths: Lib.extendDeep([], pi.edgepaths),
86-
paths: Lib.extendDeep([], pi.paths)
95+
paths: Lib.extendDeep([], pi.paths),
96+
starts: Lib.extendDeep([], pi.starts)
8797
});
8898
}
32.3 KB
Loading

Diff for: test/image/baselines/carpet_rounded-off-edgepath.png

32.2 KB
Loading
451 Bytes
Loading

0 commit comments

Comments
 (0)