Skip to content

Commit 9ec9f06

Browse files
committed
used flaglist also check1 > odd and check2 > even
1 parent 722bade commit 9ec9f06

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

src/traces/isosurface/attributes.js

+3-11
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,9 @@ var attrs = module.exports = overrideAll(extendFlat({
162162
].join(' ')
163163
},
164164
pattern: {
165-
valType: 'enumerated',
166-
values: [
167-
'all', 'check1', 'check2',
168-
'A', 'B', 'C', 'D', 'E',
169-
'AB', 'AC', 'AD', 'AE',
170-
'BC', 'BD', 'BE',
171-
'CD', 'CE', 'DE',
172-
'ABC', 'ABD', 'ABE', 'ACD', 'ACE', 'ADE',
173-
'BCD', 'BCE', 'BDE', 'CDE',
174-
'ABCD', 'ABCE', 'ABDE', 'ACDE', 'BCDE'
175-
],
165+
valType: 'flaglist',
166+
flags: ['A', 'B', 'C', 'D', 'E'],
167+
extras: ['all', 'odd', 'even'],
176168
dflt: 'all',
177169
role: 'style',
178170
description: [

src/traces/isosurface/convert.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,10 @@ function generateIsosurfaceMesh(data) {
675675
// used to create spaceframe and/or iso-surfaces
676676
var cellStyle = style;
677677
if(isEven) {
678-
if(drawingSurface && styleIncludes(style, 'check2')) cellStyle = null;
678+
if(drawingSurface && style === 'even') cellStyle = null;
679679
addCube(cellStyle, p000, p001, p010, p011, p100, p101, p110, p111, min, max);
680680
} else {
681-
if(drawingSurface && styleIncludes(style, 'check1')) cellStyle = null;
681+
if(drawingSurface && style === 'odd') cellStyle = null;
682682
addCube(cellStyle, p111, p110, p101, p100, p011, p010, p001, p000, min, max);
683683
}
684684
}

test/image/mocks/gl3d_isosurface_2surfaces-checker_spaceframe.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "isosurface",
44
"colorscale": "Blackbody",
55
"reversescale": true,
6-
"surface": { "show": true, "fill": 1.0, "pattern": "check1" },
6+
"surface": { "show": true, "fill": 1.0, "pattern": "odd" },
77
"spaceframe": { "show": true, "fill": 0.25 },
88
"slices": {
99
"x": { "show": false },

test/image/mocks/gl3d_isosurface_with_surface-pattern.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "isosurface",
44
"colorscale": "Blues",
55
"reversescale": true,
6-
"surface": { "show": true, "fill": 1.0, "pattern": "AC" },
6+
"surface": { "show": true, "fill": 1.0, "pattern": "A+C" },
77
"spaceframe": { "show": false },
88
"slices": {
99
"x": { "show": false },

0 commit comments

Comments
 (0)