Skip to content

Axis constraints #1522

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 16 commits into from
Apr 3, 2017
Merged

Axis constraints #1522

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e9a89c2
split out axis type defaults and calculate before anything else
alexcjohnson Mar 17, 2017
d9a8ab7
static axis scalewith/scaleratio constraints
alexcjohnson Mar 17, 2017
6c60a32
short-sircuit image redraw during drags
alexcjohnson Mar 27, 2017
98900a2
refactor dragbox
alexcjohnson Mar 27, 2017
84d95a5
dynamic axis constraints
alexcjohnson Mar 28, 2017
f521227
push final constraint management into relayout so it always works
alexcjohnson Mar 29, 2017
13f848e
scalewith -> scaleanchor
alexcjohnson Mar 29, 2017
dee136d
forbid scale constraints along with fixedrange
alexcjohnson Mar 29, 2017
ef3ca48
allow constraints with same axis letter
alexcjohnson Mar 29, 2017
25c2cfb
little test fix
alexcjohnson Mar 29, 2017
86e0d5a
test dynamic axis ranging with and without constraints
alexcjohnson Mar 31, 2017
745b953
don't use Object.assign even in tests, just in case
alexcjohnson Mar 31, 2017
7fc9cbd
squish interaction test plot vertically so it fits on screen
alexcjohnson Mar 31, 2017
ffd65fd
make sure scaleanchor/scaleratio changes trigger a recalc
alexcjohnson Mar 31, 2017
b4d11e6
make axis constraints work with gl2d
alexcjohnson Apr 1, 2017
23859e3
fix gl2d_click_test
alexcjohnson Apr 1, 2017
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
6 changes: 4 additions & 2 deletions src/plots/cartesian/dragbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,15 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
Axes.doTicks(gd, activeAxIds[i], true);
}

function redrawObjs(objArray, method) {
function redrawObjs(objArray, method, shortCircuit) {
for(i = 0; i < objArray.length; i++) {
var obji = objArray[i];

if((ew && activeAxIds.indexOf(obji.xref) !== -1) ||
(ns && activeAxIds.indexOf(obji.yref) !== -1)) {
method(gd, i);
// once is enough for images (which doesn't use the `i` arg anyway)
if(shortCircuit) return;
}
}
}
Expand All @@ -578,7 +580,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {

redrawObjs(fullLayout.annotations || [], Registry.getComponentMethod('annotations', 'drawOne'));
redrawObjs(fullLayout.shapes || [], Registry.getComponentMethod('shapes', 'drawOne'));
redrawObjs(fullLayout.images || [], Registry.getComponentMethod('images', 'draw'));
redrawObjs(fullLayout.images || [], Registry.getComponentMethod('images', 'draw'), true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice touch 🐎

}

function doubleClick() {
Expand Down