Chart title alignment#3

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
AlexVvx wants to merge 2 commits into from
Closed

Chart title alignment #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac4f0f
Chart Title Alignment
Dec 5, 2017
2c1b226
Title alignment update - attributes set changed
Dec 29, 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
4 changes: 2 additions & 2 deletions src/components/colorbar/draw.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
tickprefix: opts.tickprefix,
showticksuffix: opts.showticksuffix,
ticksuffix: opts.ticksuffix,
title: opts.title,
titlefont: opts.titlefont,
title: opts.title.text,
titlefont: opts.title.font,
showline: true,
anchor: 'free',
position: 1
Expand Down
10 changes: 5 additions & 5 deletions src/components/titles/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
var group = options.containerGroup;

var fullLayout = gd._fullLayout;
var font = cont.titlefont.family;
var fontSize = cont.titlefont.size;
var fontColor = cont.titlefont.color;
var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

var opacity = 1;
var isplaceholder = false;
var txt = cont.title.trim();
var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

// only make this title editable if we positively identify its property
// as one that has editing enabled.
var editAttr;
if(prop === 'title') editAttr = 'titleText';
if(prop === 'title.text') editAttr = 'titleText';
else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
var editable = gd._context.edits[editAttr];
Expand Down
4 changes: 2 additions & 2 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

// editable title
var opacity = 1;
var txt = gd._fullLayout.title;
var txt = gd._fullLayout.title.text;
if(txt === '' || !txt) opacity = 0;

var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
var setContenteditable = function() {
this.call(svgTextUtils.makeEditable, {gd: gd})
.on('edit', function(text) {
gd.framework({layout: {title: text}});
gd.framework({layout: {title: {text: text}}});
this.text(text)
.call(titleLayout);
this.call(setContenteditable);
Expand Down
38 changes: 32 additions & 6 deletions src/plot_api/subroutines.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
var fullLayout = gd._fullLayout;
var title = fullLayout.title;
var gs = fullLayout._size;

var attributes = {
x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
'text-anchor': 'start'
};

if(anchorUtils.isRightAnchor(title)) {
attributes['text-anchor'] = 'end';
attributes.x -= title.xpad;
} else if(anchorUtils.isCenterAnchor(title)) {
attributes['text-anchor'] = 'middle';
} else {
attributes.x += title.xpad;
}

if(anchorUtils.isBottomAnchor(title)) {
attributes.y += title.yref === 'paper' ? title.font.size : 0;
attributes.y -= title.ypad;
} else if(anchorUtils.isMiddleAnchor(title)) {
attributes.y -= title.font.size / 2;
} else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
attributes.y += title.yref === 'container' ? title.font.size : 0;
attributes.y += title.ypad;
}

Titles.draw(gd, 'gtitle', {
propContainer: fullLayout,
propName: 'title',
propName: 'title.text',
dfltName: 'Plot',
placeholder: fullLayout._dfltTitle.plot,
attributes: {
x: fullLayout.width / 2,
y: fullLayout._size.t / 2,
'text-anchor': 'middle'
}
attributes: attributes
});
};

Expand Down
102 changes: 92 additions & 10 deletions src/plots/layout_attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
font: globalFont,
title: {
valType: 'string',
role: 'info',
editType: 'layoutstyle',
description: [
'Sets the plot\'s title.'
].join(' ')
text: {
valType: 'string',
role: 'info',
dflt: 'Click to enter Plot title',
editType: 'layoutstyle',
description: [
'Sets the plot\'s title.'
].join(' ')
},
x: {
valType: 'number',
role: 'info',
min: -2,
max: 3,
editType: 'none',
description: [
'Sets the plot\'s title x position (in px).'
].join(' ')
},
y: {
valType: 'number',
role: 'info',
min: -2,
max: 3,
editType: 'none',
description: [
'Sets the plot\'s title y position (in px).'
].join(' ')
},
xanchor: {
valType: 'string',
role: 'info',
dflt: 'center',
editType: 'none',
description: [
'Sets the plot\'s title x anchor.'
].join(' ')
},
yanchor: {
valType: 'string',
role: 'info',
dflt: 'auto',
editType: 'none',
description: [
'Sets the plot\'s title y anchor.'
].join(' ')
},
xref: {
valType: 'string',
role: 'info',
dflt: 'paper',
editType: 'none',
description: [
'Sets the plot\'s title x reference.'
].join(' ')
},
yref: {
valType: 'string',
role: 'info',
dflt: 'paper',
editType: 'none',
description: [
'Sets the plot\'s title y reference.'
].join(' ')
},
font: fontAttrs({
editType: 'layoutstyle',
description: 'Sets the title font.'
}),
xpad: {
valType: 'number',
role: 'info',
min: 0,
dflt: 0,
editType: 'calc',
description: [
'Sets the amount of x padding (in px)',
'between the plotting area and the title'
].join(' ')
},
ypad: {
valType: 'number',
role: 'info',
min: 0,
dflt: 0,
editType: 'calc',
description: [
'Sets the amount of y padding (in px)',
'between the plotting area and the title'
].join(' ')
},
editType: 'none'
},
titlefont: fontAttrs({
editType: 'layoutstyle',
description: 'Sets the title font.'
}),
autosize: {
valType: 'boolean',
role: 'info',
Expand Down
14 changes: 11 additions & 3 deletions src/plots/plots.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

var globalFont = Lib.coerceFont(coerce, 'font');

coerce('title', layoutOut._dfltTitle.plot);

Lib.coerceFont(coerce, 'titlefont', {
coerce('title.text', layoutOut._dfltTitle.plot);
coerce('title.xanchor');
coerce('title.yanchor');
coerce('title.xref');
coerce('title.yref');
coerce('title.x');
coerce('title.y');
coerce('title.xpad');
coerce('title.ypad');

Lib.coerceFont(coerce, 'title.font', {
family: globalFont.family,
size: Math.round(globalFont.size * 1.4),
color: globalFont.color
Expand Down
8 changes: 6 additions & 2 deletions src/snapshot/cloneplot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
autosize: true,
width: 150,
height: 150,
title: '',
title: {
text: ''
},
showlegend: false,
margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

case 'thumbnail':
override = {
title: '',
title: {
text: ''
},
hidesources: true,
showlegend: false,
borderwidth: 0,
Expand Down
15 changes: 9 additions & 6 deletions test/image/mocks/14.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
}
],
"layout": {
"title": "Silicon Photovoltaics Learning Curve",
"titlefont": {
"color": "",
"family": "",
"size": 0
},
"title": {
"text": "test",
"alignment": "left",
"font": {
"color": "",
"family": "",
"size": 0
}
},
"font": {
"family": "Arial, sans-serif",
"size": 12,
Expand Down
8 changes: 6 additions & 2 deletions test/jasmine/tests/snapshot_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

data = [dummyTrace1, dummyTrace2];
layout = {
title: 'Chart Title',
title: {
text: 'Chart Title'
},
showlegend: true,
autosize: true,
width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
autosize: true,
width: 150,
height: 150,
title: '',
title: {
text: ''
},
showlegend: false,
margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
annotations: []
Expand Down
10 changes: 7 additions & 3 deletions test/jasmine/tests/titles_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
Plotly.plot(gd, data, {
xaxis: {title: ''},
yaxis: {title: ''},
title: ''
title: {
text: ''
}
}, {editable: true})
.then(function() {
return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
Plotly.plot(gd, data, {
xaxis: {title: ''},
yaxis: {title: ''},
title: ''
title: {
text: ''
}
}, {editable: true})
.then(function() {
return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
return editTitle('y', 'yaxis.title', 'YYY');
})
.then(function() {
return editTitle('g', 'title', 'TTT');
return editTitle('g', 'title.text', 'TTT');
})
.then(function() {
return Promise.all([
Expand Down
8 changes: 6 additions & 2 deletions test/jasmine/tests/validate_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
type: 'scatter',
x: [1, 2, 3]
}], {
title: 'my simple graph'
title: {
text: 'my simple graph'
}
});

expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
}]
}),
], {
title: 'my transformed graph'
title: {
text: 'my transformed graph'
}
});

expect(out.length).toEqual(5);
Expand Down
, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down

, '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
Chart title alignment#3

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

AlexVvx
wants to merge
2
commits into

from

 Closed


Chart title alignment
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3ac4f0f

Chart Title Alignment

Dec 5, 2017
2c1b226

Title alignment update - attributes set changed

Dec 29, 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


4 changes: 2 additions & 2 deletions
src/components/colorbar/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,8 @@ module.exports = function draw(gd, id) {
 tickprefix: opts.tickprefix,
 showticksuffix: opts.showticksuffix,
 ticksuffix: opts.ticksuffix,
 title: opts.title,
 titlefont: opts.titlefont,
 title: opts.title.text,
 titlefont: opts.title.font,
 showline: true,
 anchor: 'free',
 position: 1
Expand Down

10 changes: 5 additions & 5 deletions
src/components/titles/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,18 +63,18 @@ Titles.draw = function(gd, titleClass, options) {
 var group = options.containerGroup;

 var fullLayout = gd._fullLayout;
 var font = cont.titlefont.family;
 var fontSize = cont.titlefont.size;
 var fontColor = cont.titlefont.color;
 var font = typeof cont.title.text !== 'undefined' ? cont.title.font.family : cont.titlefont.family;
 var fontSize = typeof cont.title.text !== 'undefined' ? cont.title.font.size : cont.titlefont.size;
 var fontColor = typeof cont.title.text !== 'undefined' ? cont.title.font.color : cont.titlefont.color;

 var opacity = 1;
 var isplaceholder = false;
 var txt = cont.title.trim();
 var txt = typeof cont.title.text !== 'undefined' ? cont.title.text.trim() : cont.title.trim();

 // only make this title editable if we positively identify its property
 // as one that has editing enabled.
 var editAttr;
 if(prop === 'title') editAttr = 'titleText';
 if(prop === 'title.text') editAttr = 'titleText';
 else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
 else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
 var editable = gd._context.edits[editAttr];
Expand Down

4 changes: 2 additions & 2 deletions
src/plot_api/plot_api.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ function plotPolar(gd, data, layout) {

 // editable title
 var opacity = 1;
 var txt = gd._fullLayout.title;
 var txt = gd._fullLayout.title.text;
 if(txt === '' || !txt) opacity = 0;

 var titleLayout = function() {
Expand DownExpand Up@@ -597,7 +597,7 @@ function plotPolar(gd, data, layout) {
 var setContenteditable = function() {
 this.call(svgTextUtils.makeEditable, {gd: gd})
 .on('edit', function(text) {
 gd.framework({layout: {title: text}});
 gd.framework({layout: {title: {text: text}}});
 this.text(text)
 .call(titleLayout);
 this.call(setContenteditable);
Expand Down

38 changes: 32 additions & 6 deletions
src/plot_api/subroutines.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ var ModeBar = require('../components/modebar');
var initInteractions = require('../plots/cartesian/graph_interact');
var cartesianConstants = require('../plots/cartesian/constants');

var anchorUtils = require('../components/legend/anchor_utils');

exports.layoutStyles = function(gd) {
 return Lib.syncOrAsync([Plots.doAutoMargin, exports.lsInner], gd);
};
Expand DownExpand Up@@ -410,16 +412,40 @@ function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,

exports.drawMainTitle = function(gd) {
 var fullLayout = gd._fullLayout;
 var title = fullLayout.title;
 var gs = fullLayout._size;

 var attributes = {
 x: title.xref === 'paper' ? gs.l + gs.w * title.x : (gs.l + gs.w + gs.r) * title.x,
 y: title.yref === 'paper' ? gs.t + gs.h * (1 - title.y) : (gs.t + gs.h + gs.b) * (1 - title.y),
 'text-anchor': 'start'
 };

 if(anchorUtils.isRightAnchor(title)) {
 attributes['text-anchor'] = 'end';
 attributes.x -= title.xpad;
 } else if(anchorUtils.isCenterAnchor(title)) {
 attributes['text-anchor'] = 'middle';
 } else {
 attributes.x += title.xpad;
 }

 if(anchorUtils.isBottomAnchor(title)) {
 attributes.y += title.yref === 'paper' ? title.font.size : 0;
 attributes.y -= title.ypad;
 } else if(anchorUtils.isMiddleAnchor(title)) {
 attributes.y -= title.font.size / 2;
 } else if(!anchorUtils.isBottomAnchor(title) && !anchorUtils.isMiddleAnchor(title)) {
 attributes.y += title.yref === 'container' ? title.font.size : 0;
 attributes.y += title.ypad;
 }

 Titles.draw(gd, 'gtitle', {
 propContainer: fullLayout,
 propName: 'title',
 propName: 'title.text',
 dfltName: 'Plot',
 placeholder: fullLayout._dfltTitle.plot,
 attributes: {
 x: fullLayout.width / 2,
 y: fullLayout._size.t / 2,
 'text-anchor': 'middle'
 }
 attributes: attributes
 });
};

Expand Down

102 changes: 92 additions & 10 deletions
src/plots/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,99 @@ globalFont.color.dflt = colorAttrs.defaultLine;
module.exports = {
 font: globalFont,
 title: {
 valType: 'string',
 role: 'info',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 text: {
 valType: 'string',
 role: 'info',
 dflt: 'Click to enter Plot title',
 editType: 'layoutstyle',
 description: [
 'Sets the plot\'s title.'
 ].join(' ')
 },
 x: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title x position (in px).'
 ].join(' ')
 },
 y: {
 valType: 'number',
 role: 'info',
 min: -2,
 max: 3,
 editType: 'none',
 description: [
 'Sets the plot\'s title y position (in px).'
 ].join(' ')
 },
 xanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'center',
 editType: 'none',
 description: [
 'Sets the plot\'s title x anchor.'
 ].join(' ')
 },
 yanchor: {
 valType: 'string',
 role: 'info',
 dflt: 'auto',
 editType: 'none',
 description: [
 'Sets the plot\'s title y anchor.'
 ].join(' ')
 },
 xref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title x reference.'
 ].join(' ')
 },
 yref: {
 valType: 'string',
 role: 'info',
 dflt: 'paper',
 editType: 'none',
 description: [
 'Sets the plot\'s title y reference.'
 ].join(' ')
 },
 font: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 xpad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of x padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 ypad: {
 valType: 'number',
 role: 'info',
 min: 0,
 dflt: 0,
 editType: 'calc',
 description: [
 'Sets the amount of y padding (in px)',
 'between the plotting area and the title'
 ].join(' ')
 },
 editType: 'none'
 },
 titlefont: fontAttrs({
 editType: 'layoutstyle',
 description: 'Sets the title font.'
 }),
 autosize: {
 valType: 'boolean',
 role: 'info',
Expand Down

14 changes: 11 additions & 3 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1151,9 +1151,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {

 var globalFont = Lib.coerceFont(coerce, 'font');

 coerce('title', layoutOut._dfltTitle.plot);

 Lib.coerceFont(coerce, 'titlefont', {
 coerce('title.text', layoutOut._dfltTitle.plot);
 coerce('title.xanchor');
 coerce('title.yanchor');
 coerce('title.xref');
 coerce('title.yref');
 coerce('title.x');
 coerce('title.y');
 coerce('title.xpad');
 coerce('title.ypad');

 Lib.coerceFont(coerce, 'title.font', {
 family: globalFont.family,
 size: Math.round(globalFont.size * 1.4),
 color: globalFont.color
Expand Down

8 changes: 6 additions & 2 deletions
src/snapshot/cloneplot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,9 @@ function cloneLayoutOverride(tileClass) {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {l: 5, r: 5, t: 5, b: 5, pad: 0},
 annotations: []
Expand All@@ -34,7 +36,9 @@ function cloneLayoutOverride(tileClass) {

 case 'thumbnail':
 override = {
 title: '',
 title: {
 text: ''
 },
 hidesources: true,
 showlegend: false,
 borderwidth: 0,
Expand Down

15 changes: 9 additions & 6 deletions
test/image/mocks/14.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,12 +97,15 @@
 }
 ], 
 "layout": {
 "title": "Silicon Photovoltaics Learning Curve", 
 "titlefont": {
 "color": "", 
 "family": "", 
 "size": 0
 }, 
 "title": {
 "text": "test",
 "alignment": "left",
 "font": {
 "color": "",
 "family": "",
 "size": 0
 }
 },
 "font": {
 "family": "Arial, sans-serif", 
 "size": 12, 
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/snapshot_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,9 @@ describe('Plotly.Snapshot', function() {

 data = [dummyTrace1, dummyTrace2];
 layout = {
 title: 'Chart Title',
 title: {
 text: 'Chart Title'
 },
 showlegend: true,
 autosize: true,
 width: 688,
Expand DownExpand Up@@ -69,7 +71,9 @@ describe('Plotly.Snapshot', function() {
 autosize: true,
 width: 150,
 height: 150,
 title: '',
 title: {
 text: ''
 },
 showlegend: false,
 margin: {'l': 5, 'r': 5, 't': 5, 'b': 5, 'pad': 0},
 annotations: []
Expand Down

10 changes: 7 additions & 3 deletions
test/jasmine/tests/titles_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return Promise.all([
Expand All@@ -99,7 +101,9 @@ describe('editable titles', function() {
 Plotly.plot(gd, data, {
 xaxis: {title: ''},
 yaxis: {title: ''},
 title: ''
 title: {
 text: ''
 }
 }, {editable: true})
 .then(function() {
 return editTitle('x', 'xaxis.title', 'XXX');
Expand All@@ -108,7 +112,7 @@ describe('editable titles', function() {
 return editTitle('y', 'yaxis.title', 'YYY');
 })
 .then(function() {
 return editTitle('g', 'title', 'TTT');
 return editTitle('g', 'title.text', 'TTT');
 })
 .then(function() {
 return Promise.all([
Expand Down

8 changes: 6 additions & 2 deletions
test/jasmine/tests/validate_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@ describe('Plotly.validate', function() {
 type: 'scatter',
 x: [1, 2, 3]
 }], {
 title: 'my simple graph'
 title: {
 text: 'my simple graph'
 }
 });

 expect(out).toBeUndefined();
Expand DownExpand Up@@ -362,7 +364,9 @@ describe('Plotly.validate', function() {
 }]
 }),
 ], {
 title: 'my transformed graph'
 title: {
 text: 'my transformed graph'
 }
 });

 expect(out.length).toEqual(5);
Expand Down