Skip to content

Commit fa1b235

Browse files
committed
handle reversed filled dimensions - bug fix issue #4275
1 parent efd28fa commit fa1b235

File tree

5 files changed

+82
-78
lines changed

5 files changed

+82
-78
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"gl-scatter3d": "^1.2.2",
8787
"gl-select-box": "^1.0.3",
8888
"gl-spikes2d": "^1.0.2",
89-
"gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#bb9e74dcaa4888ac4f27bdf4a31f8f3be2c11880",
89+
"gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#457cf0ad78cf3fa0a185ebf95a6c61e8c7d0dc0e",
9090
"gl-surface3d": "^1.4.6",
9191
"gl-text": "^1.1.8",
9292
"glslify": "^7.0.0",

src/traces/streamtube/calc.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ module.exports = function calc(gd, trace) {
100100
var Ys = distinctVals(trace.y.slice(0, len));
101101
var Zs = distinctVals(trace.z.slice(0, len));
102102

103+
gridFill = gridFill.replace('x', (x[0] > x[len - 1] ? '-' : '+') + 'x');
104+
gridFill = gridFill.replace('y', (y[0] > y[len - 1] ? '-' : '+') + 'y');
105+
gridFill = gridFill.replace('z', (z[0] > z[len - 1] ? '-' : '+') + 'z');
106+
103107
var empty = function() {
104108
len = 0;
105109
Xs = [];
@@ -114,22 +118,22 @@ module.exports = function calc(gd, trace) {
114118
var getVals = function(c) { return c === 'x' ? Xs : c === 'y' ? Ys : Zs; };
115119
var getDir = function(c) { return (+(c[len - 1] - c[0])) * 2 + 1; };
116120

117-
var arrK = getArray(gridFill[0]);
118-
var arrJ = getArray(gridFill[1]);
119-
var arrI = getArray(gridFill[2]);
120-
var nk = getVals(gridFill[0]).length;
121-
var nj = getVals(gridFill[1]).length;
122-
var ni = getVals(gridFill[2]).length;
121+
var arrK = getArray(gridFill[1]);
122+
var arrJ = getArray(gridFill[3]);
123+
var arrI = getArray(gridFill[5]);
124+
var nk = getVals(gridFill[1]).length;
125+
var nj = getVals(gridFill[3]).length;
126+
var ni = getVals(gridFill[5]).length;
123127

124128
var arbitrary = false;
125129

126130
var getIndex = function(_i, _j, _k) {
127131
return nk * (nj * _i + _j) + _k;
128132
};
129133

130-
var dirK = getDir(getArray(gridFill[0]));
131-
var dirJ = getDir(getArray(gridFill[1]));
132-
var dirI = getDir(getArray(gridFill[2]));
134+
var dirK = getDir(getArray(gridFill[1]));
135+
var dirJ = getDir(getArray(gridFill[3]));
136+
var dirI = getDir(getArray(gridFill[5]));
133137

134138
for(i = 0; i < ni - 1; i++) {
135139
for(j = 0; j < nj - 1; j++) {
Loading

0 commit comments

Comments
 (0)