Skip to content

Commit a1cb5b0

Browse files
monferamonfera
committed
removing utils.js 
1 parent 73fc1a3 commit a1cb5b0

File tree

3 files changed

+31
-167
lines changed

3 files changed

+31
-167
lines changed

‎src/traces/parcoords/lines.js

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
'use strict';
1010

11-
var utils = require('./utils');
11+
var d3 = require('d3');
1212
var createREGL = require('regl');
1313
var glslify = require('glslify');
1414
var vertexShaderSource = glslify('./shaders/vertex.glsl');
@@ -128,15 +128,6 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, data, unit
128128
return Math.max(depthLimitEpsilon, Math.min(1 - depthLimitEpsilon, d));
129129
}
130130

131-
/*
132-
var depthDimension = geometry.depthDimension;
133-
var depthUnitScale = dimensions[depthDimension].domainToUnitScale;
134-
var depth = utils.range(sampleCount * 2).map(function(d) {
135-
return Math.max(depthLimitEpsilon, Math.min(1 - depthLimitEpsilon,
136-
depthUnitScale(data[depthDimension].values[Math.round((d - d % 2) / 2)])));
137-
})
138-
*/
139-
140131
var ccolor = [];
141132
for(j = 0; j < 256; j++) {
142133
var c = unitToColor(j / 255);
@@ -275,7 +266,6 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, data, unit
275266
}
276267

277268
function approach(/* dimension */) {
278-
// utils.ndarrayOrder(, dimension.index);
279269
// console.log('Approached ', JSON.stringify(dimension.name));
280270
}
281271

@@ -313,22 +303,22 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, data, unit
313303
resolution: [canvasWidth, canvasHeight],
314304
viewBoxPosition: [x + overdrag, 0],
315305
viewBoxSize: [panelSizeX, canvasPanelSizeY],
316-
var1A: utils.range(16).map(function(d) {return d === i ? 1 : 0;}),
317-
var2A: utils.range(16).map(function(d) {return d === ii ? 1 : 0;}),
318-
var1B: utils.range(16).map(function(d) {return d + 16 === i ? 1 : 0;}),
319-
var2B: utils.range(16).map(function(d) {return d + 16 === ii ? 1 : 0;}),
320-
var1C: utils.range(16).map(function(d) {return d + 32 === i ? 1 : 0;}),
321-
var2C: utils.range(16).map(function(d) {return d + 32 === ii ? 1 : 0;}),
322-
var1D: utils.range(16).map(function(d) {return d + 48 === i ? 1 : 0;}),
323-
var2D: utils.range(16).map(function(d) {return d + 48 === ii ? 1 : 0;}),
324-
loA: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[0] : 0)) - filterEpsilon;}),
325-
hiA: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[1] : 1)) + filterEpsilon;}),
326-
loB: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 16) ? orig(i + 16).filter[0] : 0)) - filterEpsilon;}),
327-
hiB: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 16) ? orig(i + 16).filter[1] : 1)) + filterEpsilon;}),
328-
loC: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 32) ? orig(i + 32).filter[0] : 0)) - filterEpsilon;}),
329-
hiC: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 32) ? orig(i + 32).filter[1] : 1)) + filterEpsilon;}),
330-
loD: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 48) ? orig(i + 48).filter[0] : 0)) - filterEpsilon;}),
331-
hiD: utils.range(16).map(function(i) {return paddedUnit((!context && valid(i, 48) ? orig(i + 48).filter[1] : 1)) + filterEpsilon;}),
306+
var1A: d3.range(16).map(function(d) {return d === i ? 1 : 0;}),
307+
var2A: d3.range(16).map(function(d) {return d === ii ? 1 : 0;}),
308+
var1B: d3.range(16).map(function(d) {return d + 16 === i ? 1 : 0;}),
309+
var2B: d3.range(16).map(function(d) {return d + 16 === ii ? 1 : 0;}),
310+
var1C: d3.range(16).map(function(d) {return d + 32 === i ? 1 : 0;}),
311+
var2C: d3.range(16).map(function(d) {return d + 32 === ii ? 1 : 0;}),
312+
var1D: d3.range(16).map(function(d) {return d + 48 === i ? 1 : 0;}),
313+
var2D: d3.range(16).map(function(d) {return d + 48 === ii ? 1 : 0;}),
314+
loA: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[0] : 0)) - filterEpsilon;}),
315+
hiA: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 0) ? orig(i).filter[1] : 1)) + filterEpsilon;}),
316+
loB: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 16) ? orig(i + 16).filter[0] : 0)) - filterEpsilon;}),
317+
hiB: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 16) ? orig(i + 16).filter[1] : 1)) + filterEpsilon;}),
318+
loC: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 32) ? orig(i + 32).filter[0] : 0)) - filterEpsilon;}),
319+
hiC: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 32) ? orig(i + 32).filter[1] : 1)) + filterEpsilon;}),
320+
loD: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 48) ? orig(i + 48).filter[0] : 0)) - filterEpsilon;}),
321+
hiD: d3.range(16).map(function(i) {return paddedUnit((!context && valid(i, 48) ? orig(i + 48).filter[1] : 1)) + filterEpsilon;}),
332322
colorClamp: colorClamp,
333323
scatter: scatter || 0,
334324
scissorX: I === leftmostIndex ? 0 : x + overdrag,

‎src/traces/parcoords/parcoords.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'use strict';
1010

1111
var lineLayerMaker = require('./lines');
12-
var utils = require('./utils');
1312
var Lib = require('../../lib');
1413
var d3 = require('d3');
1514

@@ -21,6 +20,18 @@ function repeat(d) {
2120
return [d];
2221
}
2322

23+
function ordinalScaleSnap(scale, v) {
24+
var i, a, prevDiff, prevValue, diff;
25+
for(i = 0, a = scale.range(), prevDiff = Infinity, prevValue = a[0], diff; i < a.length; i++) {
26+
if((diff = Math.abs(a[i] - v)) > prevDiff) {
27+
return prevValue;
28+
}
29+
prevDiff = diff;
30+
prevValue = a[i];
31+
}
32+
return a[a.length - 1];
33+
}
34+
2435
function makeDomainScale(height, padding, integerPadding, dimension) {
2536
var lo = d3.min(dimension.values);
2637
var hi = d3.max(dimension.values);
@@ -508,8 +519,8 @@ module.exports = function(root, styledData, layout) {
508519
if(!empty && dimension.integer) {
509520
var panels = dimension.parent.panels;
510521
var f = panels[dimension.xIndex].filter;
511-
f[0] = utils.d3OrdinalScaleSnap(dimension.integerScale, f[0]);
512-
f[1] = utils.d3OrdinalScaleSnap(dimension.integerScale, f[1]);
522+
f[0] = ordinalScaleSnap(dimension.integerScale, f[0]);
523+
f[1] = ordinalScaleSnap(dimension.integerScale, f[1]);
513524
if(f[0] === f[1]) {
514525
f[0] = Math.max(0, f[0] - 0.05);
515526
f[1] = Math.min(1, f[1] + 0.05);

‎src/traces/parcoords/utils.js

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)