8000 Autosize / autorange fixes by alexcjohnson · Pull Request #2437 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Autosize / autorange fixes #2437

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

Merged
merged 11 commits into from
Mar 6, 2018
Merged

Autosize / autorange fixes #2437

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
85f0442
clean up config_test
alexcjohnson Mar 1, 2018
9f774c0
Fixes for both #2385 and #2428
alexcjohnson Mar 3, 2018
d9521e8
update test images for #2428 fix
alexcjohnson Mar 5, 2018
04806a2
update gl2d images for #2428 fix
alexcjohnson Mar 5, 2018
0ecaaaf
:hocho: commented-out code
alexcjohnson Mar 5, 2018
9913afe
clean up autorange.expand docs and var names
alexcjohnson Mar 5, 2018
f262dc9
Merge branch 'master' into react-autosize
alexcjohnson Mar 5, 2018
3875fcc
fast logic for axis expand where only data is an array
alexcjohnson Mar 5, 2018
8cf8d51
test editType for attrs that affect axis length
alexcjohnson Mar 5, 2018
cf48426
update gl2d autorange test for converged autorange calculation
alexcjohnson Mar 6, 2018
247c626
optimize fast autorange further by splitting log into its own loop
alexcjohnson Mar 6, 2018
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
Prev Previous commit
Next Next commit
clean up autorange.expand docs and var names
  • Loading branch information
@alexcjohnson
alexcjohnson committed Mar 5, 2018
commit 9913afe4549580bb4b0271a5cf645633a8dfdab1
41 changes: 24 additions & 17 deletions src/plots/cartesian/autorange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,25 @@ function needsAutorange(ax) {
return ax.autorange || !!(ax.rangeslider || {}).autorange;
}

// expand: if autoranging, include new data in the outer limits
// for this axis
// data is an array of numbers (ie already run through ax.d2c)
// available options:
// vpad: (number or number array) pad values (data value +-vpad)
// ppad: (number or number array) pad pixels (pixel location +-ppad)
// ppadplus, ppadminus, vpadplus, vpadminus:
// separate padding for each side, overrides symmetric
// padded: (boolean) add 5% padding to both ends
// (unless one end is overridden by tozero)
// tozero: (boolean) make sure to include zero if axis is linear,
// and make it a tight bound if possible
/*
* expand: if autoranging, include new data in the outer limits for this axis.
* Note that `expand` is called during `calc`, when we don't yet know the axis
* length; all the inputs should be based solely on the trace data, nothing
* about the axis layout.
*
* @param {object} ax: the axis being expanded. The result will be more entries
* in ax._min and ax._max if necessary to include the new data
* @param {array} data: an array of numbers (ie already run through ax.d2c)
* @param {object} options: available keys are:
* vpad: (number or number array) pad values (data value +-vpad)
* ppad: (number or number array) pad pixels (pixel location +-ppad)
* ppadplus, ppadminus, vpadplus, vpadminus:
* separate padding for each side, overrides symmetric
* padded: (boolean) add 5% padding to both ends
* (unless one end is overridden by tozero)
* tozero: (boolean) make sure to include zero if axis is linear,
* and make it a tight bound if possible
*/
function expand(ax, data, options) {
if(!needsAutorange(ax) || !data) return;

Expand All @@ -225,7 +232,7 @@ function expand(ax, data, options) {

var i, j, k, v, di, dmin, dmax, ppadiplus, ppadiminus, includeThis, vmin, vmax;

function getPad(item) {
function makePadAccessor(item) {
if(Array.isArray(item)) {
return function(i) { return Math.max(Number(item[i]||0), 0); };
}
Expand All @@ -234,12 +241,12 @@ function expand(ax, data, options) {
return function() { return v; };
}
}
var ppadplus = getPad((ax._m > 0 ?
var ppadplus = makePadAccessor((ax._m > 0 ?
options.ppadplus : options.ppadminus) || options.ppad || 0),
ppadminus = getPad((ax._m > 0 ?
ppadminus = makePadAccessor((ax._m > 0 ?
options.ppadminus : options.ppadplus) || options.ppad || 0),
vpadplus = getPad(options.vpadplus || options.vpad),
vpadminus = getPad(options.vpadminus || options.vpad);
vpadplus = makePadAccessor(options.vpadplus || options.vpad),
vpadminus = makePadAccessor(options.vpadminus || options.vpad);

function addItem(i) {
di = data[i];
Expand Down
0