Skip to content

Commit 67e7fbf

Browse files
archmojarchmoj
committed
do not coerce contour attributes if contour is disabled
- add various supply default tests for mesh3d trace
1 parent 5bc65aa commit 67e7fbf

File tree

3 files changed

+221
-9
lines changed

3 files changed

+221
-9
lines changed

‎src/traces/mesh3d/defaults.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,18 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
6565
'lightposition.x',
6666
'lightposition.y',
6767
'lightposition.z',
68-
'contour.show',
69-
'contour.color',
70-
'contour.width',
7168
'flatshading',
7269
'alphahull',
7370
'delaunayaxis',
7471
'opacity'
7572
].forEach(function(x) { coerce(x); });
7673

74+
var showContour = coerce('contour.show');
75+
if(showContour) {
76+
coerce('contour.color');
77+
coerce('contour.width');
78+
}
79+
7780
if('intensity' in traceIn) {
7881
coerce('intensity');
7982
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'c'});

‎test/jasmine/tests/mesh3d_test.js‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,223 @@
11
var Plotly = require('@lib');
2+
var Lib = require('@src/lib');
3+
var supplyDefaults = require('@src/traces/mesh3d').supplyDefaults;
24
var createGraphDiv = require('../assets/create_graph_div');
35
var destroyGraphDiv = require('../assets/destroy_graph_div');
46
var failTest = require('../assets/fail_test');
57

68
describe('Test mesh3d', function() {
79
'use strict';
810

11+
describe('supplyDefaults', function() {
12+
var defaultColor = '#444';
13+
var layout = {_dfltTitle: {colorbar: 'cb'}};
14+
15+
var traceIn, traceOut;
16+
17+
beforeEach(function() {
18+
traceOut = {};
19+
});
20+
21+
it('should set \'visible\' to false if \'x\' isn\'t provided', function() {
22+
traceIn = {
23+
y: [0, 0, 1, 1, 0, 0, 1, 1],
24+
z: [0, 0, 0, 0, 1, 1, 1, 1],
25+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
26+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
27+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
28+
};
29+
30+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
31+
expect(traceOut.visible).toBe(false);
32+
});
33+
34+
it('should set \'visible\' to false if \'y\' isn\'t provided', function() {
35+
traceIn = {
36+
x: [0, 1, 0, 1, 0, 1, 0, 1],
37+
z: [0, 0, 0, 0, 1, 1, 1, 1],
38+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
39+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
40+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
41+
};
42+
43+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
44+
expect(traceOut.visible).toBe(false);
45+
});
46+
47+
it('should set \'visible\' to false if \'z\' isn\'t provided', function() {
48+
traceIn = {
49+
x: [0, 1, 0, 1, 0, 1, 0, 1],
50+
y: [0, 0, 1, 1, 0, 0, 1, 1],
51+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
52+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
53+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
54+
};
55+
56+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
57+
expect(traceOut.visible).toBe(false);
58+
});
59+
60+
it('should set \'visible\' to false if \'i\' isn\'t provided', function() {
61+
traceIn = {
62+
x: [0, 1, 0, 1, 0, 1, 0, 1],
63+
y: [0, 0, 1, 1, 0, 0, 1, 1],
64+
z: [0, 0, 0, 0, 1, 1, 1, 1],
65+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
66+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
67+
};
68+
69+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
70+
expect(traceOut.visible).toBe(false);
71+
});
72+
73+
it('should set \'visible\' to false if \'j\' isn\'t provided', function() {
74+
traceIn = {
75+
x: [0, 1, 0, 1, 0, 1, 0, 1],
76+
y: [0, 0, 1, 1, 0, 0, 1, 1],
77+
z: [0, 0, 0, 0, 1, 1, 1, 1],
78+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
79+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
80+
};
81+
82+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
83+
expect(traceOut.visible).toBe(false);
84+
});
85+
86+
it('should set \'visible\' to false if \'k\' isn\'t provided', function() {
87+
traceIn = {
88+
x: [0, 1, 0, 1, 0, 1, 0, 1],
89+
y: [0, 0, 1, 1, 0, 0, 1, 1],
90+
z: [0, 0, 0, 0, 1, 1, 1, 1],
91+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
92+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3]
93+
};
94+
95+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
96+
expect(traceOut.visible).toBe(false);
97+
});
98+
99+
it('should coerce contour style attributes if contour line is enabled', function() {
100+
traceIn = {
101+
x: [0, 1, 0, 1, 0, 1, 0, 1],
102+
y: [0, 0, 1, 1, 0, 0, 1, 1],
103+
z: [0, 0, 0, 0, 1, 1, 1, 1],
104+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
105+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
106+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2],
107+
contour: {
108+
show: true
109+
}
110+
};
111+
112+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
113+
expect(traceOut.contour.color).toEqual('#444');
114+
expect(traceOut.contour.width).toEqual(2);
115+
});
116+
117+
it('should not coerce contour attributes when contour line is disabled', function() {
118+
traceIn = {
119+
x: [0, 1, 0, 1, 0, 1, 0, 1],
120+
y: [0, 0, 1, 1, 0, 0, 1, 1],
121+
z: [0, 0, 0, 0, 1, 1, 1, 1],
122+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
123+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
124+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2],
125+
contour: {
126+
show: false
127+
}
128+
};
129+
130+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
131+
expect(traceOut.contour.color).toBeUndefined();
132+
expect(traceOut.contour.width).toBeUndefined();
133+
});
134+
135+
it('should coerce colorscale and colorbar attributes when intensity is present', function() {
136+
traceIn = {
137+
x: [0, 1, 0, 1, 0, 1, 0, 1],
138+
y: [0, 0, 1, 1, 0, 0, 1, 1],
139+
z: [0, 0, 0, 0, 1, 1, 1, 1],
140+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
141+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
142+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2],
143+
intensity: [1, 2, 3, 4, 5, 6, 7, 8]
144+
};
145+
146+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
147+
expect(traceOut.cauto).toBe(true);
148+
expect(traceOut.cmin).toBeUndefined();
149+
expect(traceOut.cmax).toBeUndefined();
150+
expect(traceOut.colorscale).toEqual([
151+
[0, 'rgb(5,10,172)'],
152+
[0.35, 'rgb(106,137,247)'],
153+
[0.5, 'rgb(190,190,190)'],
154+
[0.6, 'rgb(220,170,132)'],
155+
[0.7, 'rgb(230,145,90)'],
156+
[1, 'rgb(178,10,28)']
157+
]);
158+
expect(traceOut.reversescale).toBe(false);
159+
expect(traceOut.showscale).toBe(true);
160+
expect(traceOut.colorbar).toBeDefined();
161+
});
162+
163+
it('should not coerce colorscale and colorbar attributes when intensity is not present', function() {
164+
traceIn = {
165+
x: [0, 1, 0, 1, 0, 1, 0, 1],
166+
y: [0, 0, 1, 1, 0, 0, 1, 1],
167+
z: [0, 0, 0, 0, 1, 1, 1, 1],
168+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
169+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
170+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
171+
};
172+
173+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
174+
expect(traceOut.cauto).toBeUndefined();
175+
expect(traceOut.cmin).toBeUndefined();
176+
expect(traceOut.cmax).toBeUndefined();
177+
expect(traceOut.colorscale).toBeUndefined();
178+
expect(traceOut.reversescale).toBeUndefined();
179+
expect(traceOut.showscale).toBe(false);
180+
expect(traceOut.colorbar).toBeUndefined();
181+
});
182+
183+
it('should inherit layout.calendar', function() {
184+
traceIn = {
185+
x: [0, 1, 0, 1, 0, 1, 0, 1],
186+
y: [0, 0, 1, 1, 0, 0, 1, 1],
187+
z: [0, 0, 0, 0, 1, 1, 1, 1],
188+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
189+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
190+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2]
191+
};
192+
supplyDefaults(traceIn, traceOut, defaultColor, Lib.extendFlat({calendar: 'islamic'}, layout));
193+
194+
// we always fill calendar attributes, because it's hard to tell if
195+
// we're on a date axis at this point.
196+
expect(traceOut.xcalendar).toBe('islamic');
197+
expect(traceOut.ycalendar).toBe('islamic');
198+
expect(traceOut.zcalendar).toBe('islamic');
199+
});
200+
201+
it('should take its own calendars', function() {
202+
var traceIn = {
203+
x: [0, 1, 0, 1, 0, 1, 0, 1],
204+
y: [0, 0, 1, 1, 0, 0, 1, 1],
205+
z: [0, 0, 0, 0, 1, 1, 1, 1],
206+
i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
207+
j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
208+
k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2],
209+
xcalendar: 'coptic',
210+
ycalendar: 'ethiopian',
211+
zcalendar: 'mayan'
212+
};
213+
214+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
215+
expect(traceOut.xcalendar).toBe('coptic');
216+
expect(traceOut.ycalendar).toBe('ethiopian');
217+
expect(traceOut.zcalendar).toBe('mayan');
218+
});
219+
});
220+
9221
describe('restyle', function() {
10222
afterEach(destroyGraphDiv);
11223

‎test/jasmine/tests/surface_test.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
var Surface = require('@src/traces/surface');
21
var Plotly = require('@lib/index');
2+
var Lib = require('@src/lib');
3+
var supplyDefaults = require('@src/traces/surface').supplyDefaults;
34
var failTest = require('../assets/fail_test');
45
var createGraphDiv = require('../assets/create_graph_div');
56
var destroyGraphDiv = require('../assets/destroy_graph_div');
67

7-
var Lib = require('@src/lib');
8-
9-
108
describe('Test surface', function() {
119
'use strict';
1210

1311
describe('supplyDefaults', function() {
14-
var supplyDefaults = Surface.supplyDefaults;
15-
1612
var defaultColor = '#444';
1713
var layout = {_dfltTitle: {colorbar: 'cb'}};
1814

@@ -106,6 +102,7 @@ describe('Test surface', function() {
106102
[0.7, 'rgb(230,145,90)'],
107103
[1, 'rgb(178,10,28)']
108104
]);
105+
expect(traceOut.reversescale).toBe(false);
109106
expect(traceOut.showscale).toBe(true);
110107
expect(traceOut.colorbar).toBeDefined();
111108
});

0 commit comments

Comments
 (0)