Skip to content

Commit ea8dccd

Browse files
committed
fix react-noop test
- by adding _lenght=null to disable transforms - by making _x, _y, _z instead of mutating fullData[i].(x|y|z) - by linking _i, _j, _k and _intensity in fullData[i] instead of i,j,k and intensity
1 parent d82f091 commit ea8dccd

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

src/traces/isosurface/convert.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ proto.handlePick = function(selection) {
5353

5454
var rawId = selection.data.index;
5555

56-
var x = this.data.x[rawId];
57-
var y = this.data.y[rawId];
58-
var z = this.data.z[rawId];
56+
var x = this.data._x[rawId];
57+
var y = this.data._y[rawId];
58+
var z = this.data._z[rawId];
5959

6060
var height = this.data._Ys.length;
6161
var depth = this.data._Zs.length;
@@ -67,9 +67,9 @@ proto.handlePick = function(selection) {
6767
var selectIndex = selection.index = k + depth * j + depth * height * i;
6868

6969
selection.traceCoordinate = [
70-
this.data.x[selectIndex],
71-
this.data.y[selectIndex],
72-
this.data.z[selectIndex],
70+
this.data._x[selectIndex],
71+
this.data._y[selectIndex],
72+
this.data._z[selectIndex],
7373
this.data.value[selectIndex]
7474
];
7575

@@ -98,11 +98,11 @@ proto.update = function(data) {
9898
}
9999

100100
var positions = zip3(
101-
toDataCoords(layout.xaxis, data.x, scene.dataScale[0], data.xcalendar),
102-
toDataCoords(layout.yaxis, data.y, scene.dataScale[1], data.ycalendar),
103-
toDataCoords(layout.zaxis, data.z, scene.dataScale[2], data.zcalendar));
101+
toDataCoords(layout.xaxis, data._x, scene.dataScale[0], data.xcalendar),
102+
toDataCoords(layout.yaxis, data._y, scene.dataScale[1], data.ycalendar),
103+
toDataCoords(layout.zaxis, data._z, scene.dataScale[2], data.zcalendar));
104104

105-
var cells = zip3(data.i, data.j, data.k);
105+
var cells = zip3(data._i, data._j, data._k);
106106

107107
var config = {
108108
positions: positions,
@@ -122,7 +122,7 @@ proto.update = function(data) {
122122
useFacetNormals: data.flatshading
123123
};
124124

125-
config.vertexIntensity = data.intensity;
125+
config.vertexIntensity = data._intensity;
126126
config.vertexIntensityBounds = [data.cmin, data.cmax];
127127
config.colormap = parseColorScale(data);
128128

@@ -137,9 +137,9 @@ proto.dispose = function() {
137137

138138
function generateIsosurfaceMesh(data) {
139139

140-
data.i = [];
141-
data.j = [];
142-
data.k = [];
140+
data._i = [];
141+
data._j = [];
142+
data._k = [];
143143

144144
var showSurface = data.surface.show;
145145
var showSpaceframe = data.spaceframe.show;
@@ -219,9 +219,9 @@ function generateIsosurfaceMesh(data) {
219219
}
220220

221221
function addFace(a, b, c) {
222-
data.i.push(a);
223-
data.j.push(b);
224-
data.k.push(c);
222+
data._i.push(a);
223+
data._j.push(b);
224+
data._k.push(c);
225225
numFaces++;
226226

227227
return numFaces - 1;
@@ -954,10 +954,10 @@ function generateIsosurfaceMesh(data) {
954954
emptyVertices();
955955
}
956956

957-
data.x = allXs;
958-
data.y = allYs;
959-
data.z = allZs;
960-
data.intensity = allVs;
957+
data._x = allXs;
958+
data._y = allYs;
959+
data._z = allZs;
960+
data._intensity = allVs;
961961

962962
data._Xs = Xs;
963963
data._Ys = Ys;

src/traces/isosurface/defaults.js

+3
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
9999
].forEach(function(x) { coerce(x); });
100100

101101
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'c'});
102+
103+
// disable 1D transforms (for now)
104+
traceOut._length = null;
102105
};

test/jasmine/assets/mock_lists.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var glMockList = [
5858
['gl3d_cone-autorange', require('@mocks/gl3d_cone-autorange.json')],
5959
['gl3d_streamtube-simple', require('@mocks/gl3d_streamtube-simple.json')],
6060
['glpolar_style', require('@mocks/glpolar_style.json')],
61-
['gl3d_isosurface_multiple-traces', require('@mocks/gl3d_isosurface_multiple-traces.json')]
61+
['gl3d_isosurface_multiple-traces', require('@mocks/gl3d_isosurface_out_of_iso_range_case.json')]
6262
];
6363

6464
var mapboxMockList = [

0 commit comments

Comments
 (0)