Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parcoords - reusing Lib.aggNums in finding extreme ranges #4013

Merged
merged 1 commit into from
Jul 3, 2019
Merged

parcoords - reusing Lib.aggNums in finding extreme ranges #4013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions src/traces/parcoords/parcoords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,23 @@ var c = require('./constants');
var brush = require('./axisbrush');
var lineLayerMaker = require('./lines');

function findExtreme(fn, values, len) {
return Lib.aggNums(fn, null, values, len);
}

function findExtremes(values, len) {
return [
findExtreme(Math.min, values, len),
findExtreme(Math.max, values, len)
];
}

function dimensionExtent(dimension) {
var lo = dimension.range ? dimension.range[0] : Lib.aggNums(Math.min, null, dimension.values, dimension._length);
var hi = dimension.range ? dimension.range[1] : Lib.aggNums(Math.max, null, dimension.values, dimension._length);
var range = dimension.range;
if(!range) range = findExtremes(dimension.values, dimension._length);

var lo = range[0];
var hi = range[1];

if(isNaN(lo) || !isFinite(lo)) {
lo = 0;
Expand Down Expand Up @@ -152,11 +166,13 @@ function model(layout, d, i) {
var rangeFont = trace.rangefont;

var lines = Lib.extendDeepNoArrays({}, line, {
color: lineColor.map(d3.scale.linear().domain(dimensionExtent({
values: lineColor,
range: [cOpts.min, cOpts.max],
_length: trace._length
}))),
color: lineColor.map(d3.scale.linear().domain(
dimensionExtent({
values: lineColor,
range: [cOpts.min, cOpts.max],
_length: trace._length
})
)),
blockLineCount: c.blockLineCount,
canvasOverdrag: c.overdrag * c.canvasPixelRatio
});
Expand Down Expand Up @@ -381,28 +397,15 @@ function calcAllTicks(cd) {
for(var i = 0; i < cd.length; i++) {
for(var j = 0; j < cd[i].length; j++) {
var trace = cd[i][j].trace;
var len = trace._length;
var dimensions = trace.dimensions;

for(var k = 0; k < dimensions.length; k++) {
var values = dimensions[k].values;
var dim = dimensions[k]._ax;

if(dim) {
if(!dim.range) {
var max = -Infinity;
var min = Infinity;
for(var q = 0; q < len; q++) {
var v = values[q];
if(isFinite(v)) {
if(max < v) max = v;
if(min > v) min = v;
}
}
dim.range = [min, max];
}

if(!dim.dtick) dim.dtick = 0.01 * Math.abs(dim.range[1] - dim.range[0]);
if(!dim.range) dim.range = findExtremes(values, trace._length);
if(!dim.dtick) dim.dtick = 0.01 * (Math.abs(dim.range[1] - dim.range[0]) || 1);

dim.tickformat = dimensions[k].tickformat;
Axes.calcTicks(dim);
Expand Down