Skip to content

Explore axes #6319

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

Closed
wants to merge 3 commits into from
Closed

Explore axes #6319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f013426
Add mock and exploratory code
hannahker Sep 15, 2022
7e45c3b
MVP with hard coded title offset
hannahker Sep 19, 2022
68b8f8f
Add more complex mock and clean up code
hannahker Sep 19, 2022
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
15 changes: 14 additions & 1 deletion src/plot_api/subroutines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,15 @@ function lsInner(gd) {

function getLinePosition(ax, counterAx, side) {
var lwHalf = ax._lw / 2;
var xshift = ax.position > 0 ? 0 : ax._xshift;

if(ax._id.charAt(0) === 'x') {
if(!counterAx) return gs.t + gs.h * (1 - (ax.position || 0)) + (lwHalf % 1);
else if(side === 'top') return counterAx._offset - pad - lwHalf;
return counterAx._offset + counterAx._length + pad + lwHalf;
}

if(!counterAx) return gs.l + gs.w * (ax.position || 0) + (lwHalf % 1);
if(!counterAx) return gs.l + gs.w * (ax.position || 0) + (lwHalf % 1) + xshift;
else if(side === 'right') return counterAx._offset + counterAx._length + pad + lwHalf;
return counterAx._offset - pad - lwHalf;
}
Expand Down Expand Up @@ -713,3 +714,15 @@ exports.drawMarginPushers = function(gd) {
Registry.getComponentMethod('updatemenus', 'draw')(gd);
Registry.getComponentMethod('colorbar', 'draw')(gd);
};

// function getAxDepth(ax) {
// var depth = null;
// if (ax.type == 'multicategory') {
// depth = majorTickSigns[4] * (getLabelLevelBbox('tick2')[ax.side] - mainLinePosition);

// } else if(ax.title.hasOwnProperty('standoff')) {
// depth = majorTickSigns[4] * (getLabelLevelBbox()[ax.side] - mainLinePosition);
// }

// }

37 changes: 26 additions & 11 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,16 +2248,23 @@ axes.draw = function(gd, arg, opts) {

var axList = (!arg || arg === 'redraw') ? axes.listIds(gd) : arg;

var allDepths = []

return Lib.syncOrAsync(axList.map(function(axId) {
return function() {
if(!axId) return;

var ax = axes.getFromId(gd, axId);
var axDone = axes.drawOne(gd, ax, opts);
var axDone = axes.drawOne(gd, ax, opts, allDepths);

// If we've just drawn a y axis, then keep track of its width so that we can push
// out additional y axes if needed
if (ax._id.charAt(0) == 'y') {
allDepths.push(ax._depth + ax._titleDepth);
}

ax._r = ax.range.slice();
ax._rl = Lib.simpleMap(ax._r, ax.r2l);

return axDone;
};
}));
Expand Down Expand Up @@ -2290,13 +2297,13 @@ axes.draw = function(gd, arg, opts) {
* - ax._depth (when required only):
* - and calls ax.setScale
*/
axes.drawOne = function(gd, ax, opts) {
axes.drawOne = function(gd, ax, opts, allDepths) {
opts = opts || {};

var i, sp, plotinfo;

ax.setScale();

var fullLayout = gd._fullLayout;
var axId = ax._id;
var axLetter = axId.charAt(0);
Expand Down Expand Up @@ -2330,6 +2337,15 @@ axes.drawOne = function(gd, ax, opts) {
// (touching either the tick label or ticks)
// depth can be expansive to compute, so we only do so when required
ax._depth = null;
// If drawing another y-axis, then look at the sum of the depths of existing axes
// to determine how much to shift this one out by
// TODO: Also need to account for the expected depth of the current axis
// (if drawing from the left inwards)
if (axLetter == 'y' & allDepths.length > 0) {
ax._xshift = allDepths.reduce((a, b) => a + b);
} else {
ax._xshift = null;
}

// calcLabelLevelBbox can be expensive,
// so make sure to not call it twice during the same Axes.drawOne call
Expand Down Expand Up @@ -2646,7 +2662,6 @@ axes.drawOne = function(gd, ax, opts) {
) {
seq.push(function() { return drawTitle(gd, ax); });
}

return Lib.syncOrAsync(seq);
};

Expand Down Expand Up @@ -3765,11 +3780,13 @@ function drawDividers(gd, ax, opts) {
* @return {number}
*/
axes.getPxPosition = function(gd, ax) {

var gs = gd._fullLayout._size;
var axLetter = ax._id.charAt(0);
var side = ax.side;
var anchorAxis;

var xshift = ax.position > 0 ? 0 : ax._xshift;
if(ax.anchor !== 'free') {
anchorAxis = ax._anchorAxis;
} else if(axLetter === 'x') {
Expand All @@ -3779,16 +3796,15 @@ axes.getPxPosition = function(gd, ax) {
};
} else if(axLetter === 'y') {
anchorAxis = {
_offset: gs.l + (ax.position || 0) * gs.w,
_offset: (gs.l + (ax.position || 0) * gs.w) + xshift,
_length: 0
};
}

if(side === 'top' || side === 'left') {
return anchorAxis._offset;
} else if(side === 'bottom' || side === 'right') {
return anchorAxis._offset + anchorAxis._length;
}
}
};

/**
Expand Down Expand Up @@ -3868,7 +3884,7 @@ function drawTitle(gd, ax) {
}
}
}

ax._titleDepth = titleStandoff
var pos = axes.getPxPosition(gd, ax);
var transform, x, y;

Expand All @@ -3880,7 +3896,6 @@ function drawTitle(gd, ax) {
x = (ax.side === 'right') ? pos + titleStandoff : pos - titleStandoff;
transform = {rotate: '-90', offset: 0};
}

var avoid;

if(ax.type !== 'multicategory') {
Expand Down
12 changes: 8 additions & 4 deletions test/image/mocks/multiple_axes_multiple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"color": "#1f77b4"
},
"text": "yaxis title"
}
},
"automargin": true
},
"yaxis2": {
"title": {
Expand All @@ -95,7 +96,8 @@
"anchor": "free",
"side": "left",
"position": 0.15,
"overlaying": "y"
"overlaying": "y",
"automargin": true
},
"yaxis3": {
"title": {
Expand All @@ -109,7 +111,8 @@
},
"anchor": "x",
"side": "right",
"overlaying": "y"
"overlaying": "y",
"automargin": true
},
"yaxis4": {
"title": {
Expand All @@ -124,7 +127,8 @@
"anchor": "free",
"side": "right",
"position": 0.85,
"overlaying": "y"
"overlaying": "y",
"automargin": true
}
}
}
112 changes: 112 additions & 0 deletions test/image/mocks/z-multiple-yaxes-complex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"data": [
{
"x": [
1,
2,
3
],
"y": [
4,
5,
6
],
"name": "yaxis1 data",
"type": "scatter"
},
{
"x": [
2,
3,
4
],
"y": [
40,
50,
60
],
"name": "yaxis2 data",
"yaxis": "y2",
"type": "scatter"
},
{
"x": [
3,
4,
5
],
"y": [
400,
500,
600
],
"name": "yaxis3 data",
"yaxis": "y3",
"type": "scatter"
},
{
"x": [
4,
5,
6
],
"y": [
4000,
5000,
6000
],
"name": "yaxis4 data",
"yaxis": "y4",
"type": "scatter"
}
],
"layout": {
"title": {
"text": "multiple y-axes example - complex formatting"
},
"width": 800,
"xaxis": {
"domain": [
0.5,
1
]
},

"yaxis": {
"title": {
"text": "yaxis title"

},
"automargin": true,
"anchor": "free"
},
"yaxis2": {
"title": {"text": "yaxis2 title"},
"anchor": "free",
"overlaying": "y",
"automargin": true,
"ticklen":25

},
"yaxis3": {
"title": {
"text": "yaxis3 title",
"font": {"size": 28}
},
"tickfont": {"size": 28},
"anchor": "free",
"overlaying": "y",
"automargin": true
},
"yaxis4": {
"anchor": "free",
"title": {
"text": "yaxis4 title",
"font": {"size": 8}
},
"tickfont": {"size": 8},
"overlaying": "y",
"automargin": true
}
}
}
Loading