Skip to content

Commit db0239b

Browse files
committed
DRYing up inefficient placeholder code 1
1 parent 0838d95 commit db0239b

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

src/traces/parcoords/lines.js

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,21 +296,36 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, data, unit
296296
}
297297
}
298298

299+
var dims = d3.range(2).map(function() {return d3.range(4).map(function() {return d3.range(16)});});
300+
299301
// todo turn it into something DRYer and using efficient loops
300302
function makeItem(i, ii, x, panelSizeX, originalXIndex, scatter) {
303+
var lr, mat, d, index;
304+
var leftRight = [i, ii];
305+
306+
for(lr = 0; lr < 2; lr++) {
307+
index = leftRight[lr]
308+
for(mat = 0; mat < 4; mat++) {
309+
for (d = 0; d < 16; d++) {
310+
dims[lr][mat][d] = d + mat * 16 === index ? 1 : 0;
311+
}
312+
}
313+
}
314+
301315
return {
302316
key: originalXIndex,
303317
resolution: [canvasWidth, canvasHeight],
304318
viewBoxPosition: [x + overdrag, 0],
305319
viewBoxSize: [panelSizeX, canvasPanelSizeY],
306-
dim1A: d3.range(16).map(function(d) {return d === i ? 1 : 0;}),
307-
dim2A: d3.range(16).map(function(d) {return d === ii ? 1 : 0;}),
308-
dim1B: d3.range(16).map(function(d) {return d + 16 === i ? 1 : 0;}),
309-
dim2B: d3.range(16).map(function(d) {return d + 16 === ii ? 1 : 0;}),
310-
dim1C: d3.range(16).map(function(d) {return d + 32 === i ? 1 : 0;}),
311-
dim2C: d3.range(16).map(function(d) {return d + 32 === ii ? 1 : 0;}),
312-
dim1D: d3.range(16).map(function(d) {return d + 48 === i ? 1 : 0;}),
313-
dim2D: d3.range(16).map(function(d) {return d + 48 === ii ? 1 : 0;}),
320+
dim1A: dims[0][0],
321+
dim1B: dims[0][1],
322+
dim1C: dims[0][2],
323+
dim1D: dims[0][3],
324+
dim2A: dims[1][0],
325+
dim2B: dims[1][1],
326+
dim2C: dims[1][2],
327+
dim2D: dims[1][3],
328+
314329
loA: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[0] : 0)) - filterEpsilon;}),
315330
hiA: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[1] : 1)) + filterEpsilon;}),
316331
loB: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 16) ? orig(i + 16).filter[0] : 0)) - filterEpsilon;}),

0 commit comments

Comments
 (0)