[WIP] Vertically center multi-line labels on Y axis#2424

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
alexcjohnson merged 11 commits into from
Mar 5, 2018
Merged

[WIP] Vertically center multi-line labels on Y axis #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb90e1d
Add test illustrating #1137.
darabos Feb 28, 2018
b682fe3
Vertically center multi-line labels on Y axis.
darabos Feb 28, 2018
8f8876c
Fix multi-line alignment in different angles and sides.
darabos Mar 1, 2018
e96f7e1
More complete bar_multiline_labels test with the change disabled.
darabos Mar 5, 2018
3adcdc9
Correct alignment on all sides and angles, reliable line count.
darabos Mar 5, 2018
b7a67ce
Fix eslint mistakes.
darabos Mar 5, 2018
4431506
Update affected prior baselines.
darabos Mar 5, 2018
261cb9d
Merge branch 'master' of https://github.com/plotly/plotly.js into dar…
darabos Mar 5, 2018
f4b2a85
Regenerate gl2d_date_axes.png after merge to resolve conflict.
darabos Mar 5, 2018
f9e1a57
Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…
darabos Mar 5, 2018
99292ee
Update baseline.
darabos Mar 5, 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
28 changes: 28 additions & 0 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
});
}

// How much to shift a multi-line label to center it vertically.
function getAnchorHeight(lineCount, lineHeight, angle) {
var h = (lineCount - 1) * lineHeight;
if(axLetter === 'x') {
if(angle < -60 || 60 < angle) {
return -0.5 * h;
} else if(axside === 'top') {
return -h;
}
} else {
angle *= axside === 'left' ? 1 : -1;
if(angle < -30) {
return -h;
} else if(angle < 30) {
return -0.5 * h;
}
}
return 0;
}

function positionLabels(s, angle) {
s.each(function(d) {
var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
(' rotate(' + angle + ',' + labelx(d) + ',' +
(labely(d) - d.fontSize / 2) + ')') :
'');
var anchorHeight = getAnchorHeight(
svgTextUtils.lineCount(thisLabel),
LINE_SPACING * d.fontSize,
isNumeric(angle) ? +angle : 0);
if(anchorHeight) {
transform += ' translate(0, ' + anchorHeight + ')';
}
if(mathjaxGroup.empty()) {
thisLabel.select('text').attr({
transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 161 additions & 0 deletions test/image/mocks/bar_multiline_labels.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
"data":[
{
"type": "bar",
"x":["x 1","multiple<br>lines","one<br >two<BR>three"],
"y":["y 1","multiple<br>lines","one<br >two<BR>three"]
},
{
"type": "bar",
"x":["x 2","multiple<br>lines","one<br>two<br>three"],
"y":["y 2","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x2",
"yaxis": "y2"
},
{
"type": "bar",
"x":["x 3","multiple<br>lines","one<br>two<br>three"],
"y":["y 3","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x3",
"yaxis": "y3"
},
{
"type": "bar",
"x":["x 4","multiple<br>lines","one<br>two<br>three"],
"y":["y 4","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x4",
"yaxis": "y4"
},
{
"type": "bar",
"orientation": "h",
"x":["x 5","multiple<br>lines","one<br>two<br>three"],
"y":["y 5","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x5",
"yaxis": "y5"
},
{
"type": "bar",
"orientation": "h",
"x":["x 6","multiple<br>lines","one<br>two<br>three"],
"y":["y 6","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x6",
"yaxis": "y6"
},
{
"type": "scatter",
"x":["x 7","multiple<br>lines","one<br>two<br>three"],
"y":["y 7","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x7",
"yaxis": "y7"
},
{
"type": "scatter",
"x":["x 8","multiple<br>lines","one<br>two<br>three"],
"y":["y 8","multiple<br>lines","one<br>two<br>three"],
"xaxis": "x8",
"yaxis": "y8"
}
],
"layout":{
"showlegend": false,
"xaxis": {
"ticks": "outside",
"domain": [0, 0.4]
},
"yaxis": {
"ticks": "outside",
"domain": [0, 0.4]
},
"xaxis2": {
"ticks": "outside",
"domain": [0, 0.4],
"side": "top",
"anchor": "y2",
"tickangle": 90
},
"yaxis2": {
"ticks": "outside",
"domain": [0, 0.4],
"side": "right",
"tickangle": 90
},
"xaxis3": {
"ticks": "outside",
"domain": [0.6, 1],
"tickangle": 90
},
"yaxis3": {
"ticks": "outside",
"domain": [0, 0.4],
"anchor": "x3",
"tickangle": 90
},
"xaxis4": {
"ticks": "outside",
"domain": [0.6, 1],
"side": "top"
},
"yaxis4": {
"ticks": "outside",
"domain": [0, 0.4],
"side": "right",
"anchor": "x4"
},
"xaxis5": {
"ticks": "outside",
"domain": [0, 0.4],
"anchor": "y5",
"tickangle": 45
},
"yaxis5": {
"ticks": "outside",
"domain": [0.6, 1],
"anchor": "x5",
"tickangle": 45
},
"xaxis6": {
"ticks": "outside",
"domain": [0, 0.4],
"side": "top",
"anchor": "y6",
"tickangle": -90
},
"yaxis6": {
"ticks": "outside",
"domain": [0.6, 1],
"anchor": "x6",
"side": "right",
"tickangle": -90
},
"xaxis7": {
"ticks": "outside",
"domain": [0.6, 1],
"anchor": "y7",
"tickangle": -90
},
"yaxis7": {
"ticks": "outside",
"domain": [0.6, 1],
"anchor": "x7",
"tickangle": -90
},
"xaxis8": {
"ticks": "outside",
"domain": [0.6, 1],
"side": "top",
"anchor": "y8",
"tickangle": -45
},
"yaxis8": {
"ticks": "outside",
"domain": [0.6, 1],
"side": "right",
"anchor": "x8",
"tickangle": 45
},
"legend": "none",
"height":800,
"width":800
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[WIP] Vertically center multi-line labels on Y axis#2424

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

alexcjohnson
merged 11 commits into

from

Mar 5, 2018
 Merged


[WIP] Vertically center multi-line labels on Y axis
#2424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
bb90e1d

Add test illustrating #1137.


darabos Feb 28, 2018
b682fe3

Vertically center multi-line labels on Y axis.


darabos Feb 28, 2018
8f8876c

Fix multi-line alignment in different angles and sides.


darabos Mar 1, 2018
e96f7e1

More complete bar_multiline_labels test with the change disabled.


darabos Mar 5, 2018
3adcdc9

Correct alignment on all sides and angles, reliable line count.


darabos Mar 5, 2018
b7a67ce

Fix eslint mistakes.


darabos Mar 5, 2018
4431506

Update affected prior baselines.


darabos Mar 5, 2018
261cb9d

Merge branch 'master' of https://github.com/plotly/plotly.js into dar…


darabos Mar 5, 2018
f4b2a85

Regenerate gl2d_date_axes.png after merge to resolve conflict.


darabos Mar 5, 2018
f9e1a57

Large anchor positioning cutoff for X. Use 30/60 degrees. Fix label i…


darabos Mar 5, 2018
99292ee

Update baseline.


darabos Mar 5, 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


28 changes: 28 additions & 0 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ var MINUS_SIGN = constants.MINUS_SIGN;
var BADNUM = constants.BADNUM;

var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
var LINE_SPACING = require('../../constants/alignment').LINE_SPACING;

var axes = module.exports = {};

Expand DownExpand Up@@ -2039,6 +2040,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
 });
 }

 // How much to shift a multi-line label to center it vertically.
 function getAnchorHeight(lineCount, lineHeight, angle) {
 var h = (lineCount - 1) * lineHeight;
 if(axLetter === 'x') {
 if(angle < -60 || 60 < angle) {
 return -0.5 * h;
 } else if(axside === 'top') {
 return -h;
 }
 } else {
 angle *= axside === 'left' ? 1 : -1;
 if(angle < -30) {
 return -h;
 } else if(angle < 30) {
 return -0.5 * h;
 }
 }
 return 0;
 }

 function positionLabels(s, angle) {
 s.each(function(d) {
 var anchor = labelanchor(angle, d);
Expand All@@ -2049,6 +2070,13 @@ axes.doTicks = function(gd, axid, skipTitle) {
 (' rotate(' + angle + ',' + labelx(d) + ',' +
 (labely(d) - d.fontSize / 2) + ')') :
 '');
 var anchorHeight = getAnchorHeight(
 svgTextUtils.lineCount(thisLabel),
 LINE_SPACING * d.fontSize,
 isNumeric(angle) ? +angle : 0);
 if(anchorHeight) {
 transform += ' translate(0, ' + anchorHeight + ')';
 }
 if(mathjaxGroup.empty()) {
 thisLabel.select('text').attr({
 transform: transform,
Expand Down
Binary file addedtest/image/baselines/bar_multiline_labels.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/benchmarks.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/cliponaxis_false-dates-log.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_date_axes.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/world-cals.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

161 changes: 161 additions & 0 deletions
test/image/mocks/bar_multiline_labels.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
{
 "data":[
 {
 "type": "bar",
 "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
 "y":["y 1","multiple<br>lines","one<br >two<BR>three"]
 },
 {
 "type": "bar",
 "x":["x 2","multiple<br>lines","one<br>two<br>three"],
 "y":["y 2","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x2",
 "yaxis": "y2"
 },
 {
 "type": "bar",
 "x":["x 3","multiple<br>lines","one<br>two<br>three"],
 "y":["y 3","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x3",
 "yaxis": "y3"
 },
 {
 "type": "bar",
 "x":["x 4","multiple<br>lines","one<br>two<br>three"],
 "y":["y 4","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x4",
 "yaxis": "y4"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 5","multiple<br>lines","one<br>two<br>three"],
 "y":["y 5","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x5",
 "yaxis": "y5"
 },
 {
 "type": "bar",
 "orientation": "h",
 "x":["x 6","multiple<br>lines","one<br>two<br>three"],
 "y":["y 6","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x6",
 "yaxis": "y6"
 },
 {
 "type": "scatter",
 "x":["x 7","multiple<br>lines","one<br>two<br>three"],
 "y":["y 7","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x7",
 "yaxis": "y7"
 },
 {
 "type": "scatter",
 "x":["x 8","multiple<br>lines","one<br>two<br>three"],
 "y":["y 8","multiple<br>lines","one<br>two<br>three"],
 "xaxis": "x8",
 "yaxis": "y8"
 }
 ],
 "layout":{
 "showlegend": false,
 "xaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "yaxis": {
 "ticks": "outside",
 "domain": [0, 0.4]
 },
 "xaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y2",
 "tickangle": 90
 },
 "yaxis2": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "tickangle": 90
 },
 "xaxis3": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "tickangle": 90
 },
 "yaxis3": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "x3",
 "tickangle": 90
 },
 "xaxis4": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top"
 },
 "yaxis4": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "right",
 "anchor": "x4"
 },
 "xaxis5": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "anchor": "y5",
 "tickangle": 45
 },
 "yaxis5": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x5",
 "tickangle": 45
 },
 "xaxis6": {
 "ticks": "outside",
 "domain": [0, 0.4],
 "side": "top",
 "anchor": "y6",
 "tickangle": -90
 },
 "yaxis6": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x6",
 "side": "right",
 "tickangle": -90
 },
 "xaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "y7",
 "tickangle": -90
 },
 "yaxis7": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "anchor": "x7",
 "tickangle": -90
 },
 "xaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "top",
 "anchor": "y8",
 "tickangle": -45
 },
 "yaxis8": {
 "ticks": "outside",
 "domain": [0.6, 1],
 "side": "right",
 "anchor": "x8",
 "tickangle": 45
 },
 "legend": "none",
 "height":800,
 "width":800
 }
}