Skip to content

Parcoords fonts#1624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etpinard merged 6 commits into from
May 9, 2017
Merged

Parcoords fonts #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
505614d
parcoords fonts
monfera Apr 26, 2017
9939241
specify default sizes for parcoords fonts; screenshot fix
monfera Apr 26, 2017
a8e444a
avoid duplicate coercion
monfera Apr 26, 2017
3925d6d
make parcoord font size dflt scale linearly with global font
etpinard May 1, 2017
a3544c7
showcase new parcoord font attributes in `parcoords_2` mock
etpinard May 1, 2017
c0e0845
update parcoords baselines (:hocho: font-weight)
etpinard May 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/traces/parcoords/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
}
},

labelfont: extendFlat({}, fontAttrs, {
description: 'Sets the font for the `dimension` labels.'
}),
tickfont: extendFlat({}, fontAttrs, {
description: 'Sets the font for the `dimension` tick values.'
}),
rangefont: extendFlat({}, fontAttrs, {
description: 'Sets the font for the `dimension` range values.'
}),

dimensions: {
_isLinkedToArray: 'dimension',
label: {
Expand Down
13 changes: 12 additions & 1 deletion src/traces/parcoords/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
function coerce(attr, dflt) {
return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
if(!Array.isArray(dimensions) || !dimensions.length) {
traceOut.visible = false;
}

// make default font size 10px,
// scale linearly with global font size
var fontDflt = {
family: layout.font.family,
size: Math.round(layout.font.size * (10 / 12)),

@etpinardetpinardMay 1, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@monfera this is what I came off with.

As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.

But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.

@monferamonferaMay 1, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!

color: layout.font.color
};

Lib.coerceFont(coerce, 'labelfont', fontDflt);
Lib.coerceFont(coerce, 'tickfont', fontDflt);
Lib.coerceFont(coerce, 'rangefont', fontDflt);
};
30 changes: 16 additions & 14 deletions src/traces/parcoords/parcoords.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
line = trace.line,
domain = trace.domain,
dimensions = trace.dimensions,
width = layout.width;
width = layout.width,
labelFont = trace.labelfont,
tickFont = trace.tickfont,
rangeFont = trace.rangefont;

var lines = Lib.extendDeep({}, line, {
color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
tickDistance: c.tickDistance,
unitToColor: unitToColorScale(cscale),
lines: lines,
labelFont: labelFont,
tickFont: tickFont,
rangeFont: rangeFont,
translateX: domain.x[0] * width,
translateY: layout.height - domain.y[1] * layout.height,
pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
selection
.classed('axisExtentText', true)
.attr('text-anchor', 'middle')
.style('font-weight', 100)

@etpinardetpinardMay 1, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.

@monferamonferaMay 1, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.

@etpinardetpinardMay 1, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.

This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.

@monferamonferaMay 1, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)

.style('font-size', '10px')

@etpinardetpinardApr 26, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.

I guess we'll have to keep it this way until v2 😬

.style('cursor', 'default')
.style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
null)
.tickFormat(d.ordinal ? function(d) {return d;} : null)
.scale(scale));
Drawing.font(axis.selectAll('text'), d.model.tickFont);
});

axis
.selectAll('.domain, .tick')
.selectAll('.domain, .tick>line')
.attr('fill', 'none')
.attr('stroke', 'black')
.attr('stroke-opacity', 0.25)
.attr('stroke-width', '1px');

axis
.selectAll('text')
.style('font-weight', 100)
.style('font-size', '10px')
.style('fill', 'black')
.style('fill-opacity', 1)
.style('stroke', 'none')
.style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
.style('cursor', 'default')
.style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
.append('text')
.classed('axisTitle', true)
.attr('text-anchor', 'middle')
.style('font-family', 'sans-serif')
.style('font-size', '10px')
.style('cursor', 'ew-resize')
.style('user-select', 'none')
.style('pointer-events', 'auto');

axisTitle
.attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
.text(function(d) {return d.label;});
.text(function(d) {return d.label;})
.each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

var axisExtent = axisOverlays.selectAll('.axisExtent')
.data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
.call(styleExtentTexts);

axisExtentTopText
.text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
.text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
.each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
.data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
.call(styleExtentTexts);

axisExtentBottomText
.text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
.text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
.each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

var axisBrush = axisOverlays.selectAll('.axisBrush')
.data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_parcoords_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_parcoords_2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_parcoords_blocks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/gl2d_parcoords_large.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 19 additions & 2 deletions test/image/mocks/gl2d_parcoords_2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
"layout": {
"width": 500,
"height": 500
"height": 500,
"font": {
"size": 15
}
},

"data": [{
Expand All@@ -13,13 +16,27 @@
"y": [0.2, 0.7]
},

"labelfont": {
"color": "red",
"size": 20
},
"tickfont": {
"color": "blue"
},
"rangefont": {
"color": "green"
},

"line": {
"showscale": true,
"reversescale": true,
"colorscale": "Jet",
"cmin": -4000,
"cmax": -100,
"color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
"color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
"colorbar": {
"x": 1.1
}
},

"dimensions": [
Expand Down
22 changes: 21 additions & 1 deletion test/jasmine/tests/parcoords_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
expect(gd._fullData[0].opacity).toBeUndefined();
});

it('should use global font as label, tick and range font defaults', function() {
var gd = Lib.extendDeep({}, mock1);
gd.layout.font = {
family: 'Gravitas',
size: 20,
color: 'blue'
};

Plots.supplyDefaults(gd);

var expected = {
family: 'Gravitas',
size: 17,
color: 'blue'
};

expect(gd._fullData[0].labelfont).toEqual(expected);
expect(gd._fullData[0].tickfont).toEqual(expected);
expect(gd._fullData[0].rangefont).toEqual(expected);
});
});

describe('parcoords defaults', function() {

function _supply(traceIn) {
var traceOut = { visible: true },
defaultColor = '#444',
layout = { };
layout = { font: Plots.layoutAttributes.font };

Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Parcoords fonts by monfera · Pull Request #1624 · plotly/plotly.js · GitHub
Skip to content
Parcoords fonts#1624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 6 commits into

from

May 9, 2017
 Merged


Parcoords fonts
#1624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
505614d

parcoords fonts


monfera Apr 26, 2017
9939241

specify default sizes for parcoords fonts; screenshot fix


monfera Apr 26, 2017
a8e444a

avoid duplicate coercion


monfera Apr 26, 2017
3925d6d

make parcoord font size dflt scale linearly with global font


etpinard May 1, 2017
a3544c7

showcase new parcoord font attributes in `parcoords_2` mock


etpinard May 1, 2017
c0e0845

update parcoords baselines (:hocho: font-weight)


etpinard May 1, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/traces/parcoords/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
var colorbarAttrs = require('../../components/colorbar/attributes');
var colorscales = require('../../components/colorscale/scales');
var axesAttrs = require('../../plots/cartesian/layout_attributes');
var fontAttrs = require('../../plots/font_attributes');

var extendDeep = require('../../lib/extend').extendDeep;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -47,6 +48,16 @@ module.exports = {
 }
 },

 labelfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` labels.'
 }),
 tickfont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` tick values.'
 }),
 rangefont: extendFlat({}, fontAttrs, {
 description: 'Sets the font for the `dimension` range values.'
 }),

 dimensions: {
 _isLinkedToArray: 'dimension',
 label: {
Expand Down

13 changes: 12 additions & 1 deletion
src/traces/parcoords/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
 return dimensionsOut;
}


module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 function coerce(attr, dflt) {
 return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
Expand All@@ -97,4 +96,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 if(!Array.isArray(dimensions) || !dimensions.length) {
 traceOut.visible = false;
 }

 // make default font size 10px,
 // scale linearly with global font size
 var fontDflt = {
 family: layout.font.family,
 size: Math.round(layout.font.size * (10 / 12)),
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera this is what I came off with.
As you pointed out, changing the font size default to 12 makes most parcoord graphs look less-than-optimal. We should fix that text-overlapping problem at some point though - similar to how we do it currently in cartesian axes. But that's for another PR. So, the 10px default value remains.
But, to make this a little more plotly-esque, we make the parcoord font size scale linearly with layout.font similar to what's done for axes titlefont.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Thanks @etpinard, also for the pointer!
 color: layout.font.color
 };

 Lib.coerceFont(coerce, 'labelfont', fontDflt);
 Lib.coerceFont(coerce, 'tickfont', fontDflt);
 Lib.coerceFont(coerce, 'rangefont', fontDflt);
};

30 changes: 16 additions & 14 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ var lineLayerMaker = require('./lines');
var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');


function keyFun(d) {return d.key;}
Expand DownExpand Up@@ -122,7 +123,10 @@ function model(layout, d, i) {
 line = trace.line,
 domain = trace.domain,
 dimensions = trace.dimensions,
 width = layout.width;
 width = layout.width,
 labelFont = trace.labelfont,
 tickFont = trace.tickfont,
 rangeFont = trace.rangefont;

 var lines = Lib.extendDeep({}, line, {
 color: lineColor.map(domainToUnitScale({values: lineColor, range: [line.cmin, line.cmax]})),
Expand All@@ -144,6 +148,9 @@ function model(layout, d, i) {
 tickDistance: c.tickDistance,
 unitToColor: unitToColorScale(cscale),
 lines: lines,
 labelFont: labelFont,
 tickFont: tickFont,
 rangeFont: rangeFont,
 translateX: domain.x[0] * width,
 translateY: layout.height - domain.y[1] * layout.height,
 pad: pad,
Expand DownExpand Up@@ -227,8 +234,6 @@ function styleExtentTexts(selection) {
 selection
 .classed('axisExtentText', true)
 .attr('text-anchor', 'middle')
 .style('font-weight', 100)
@etpinardetpinardMay 1, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@monfera is removing that font-weight setting on purpose? Unsurprisingly, it makes the image tests fail.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

As we discussed about font standardization... I assumed, perhaps incorrectly, that we don't want to customize it. I do have a preference for the lower font weight as in the case of parcoords the shape of line distribution is more important than the best readability so it's fine to keep the weight=100 but with configuration, the user can probably control the font anyway.
@etpinardetpinardMay 1, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

We don't set font-weight anyway in our code - though inputting text as <b>text</b> effectively does that.
This is another thing I wished I would've noticed while reviewing your first parcoords PR. Oh well. I think it's best to drop font-weight and make parcoords look a little more plotly-esque.
@monferamonferaMay 1, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Cool, in this case I could guess, if a bit late, how you'd go about it :-)
 .style('font-size', '10px')
@etpinardetpinardApr 26, 2017

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Ha. I see 10px was used before. I should've caught that. Elsewhere in plotly.js this would be 12px.
I guess we'll have to keep it this way until v2 😬
 .style('cursor', 'default')
 .style('user-select', 'none');
}
Expand DownExpand Up@@ -556,22 +561,18 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 null)
 .tickFormat(d.ordinal ? function(d) {return d;} : null)
 .scale(scale));
 Drawing.font(axis.selectAll('text'), d.model.tickFont);
 });

 axis
 .selectAll('.domain, .tick')
 .selectAll('.domain, .tick>line')
 .attr('fill', 'none')
 .attr('stroke', 'black')
 .attr('stroke-opacity', 0.25)
 .attr('stroke-width', '1px');

 axis
 .selectAll('text')
 .style('font-weight', 100)
 .style('font-size', '10px')
 .style('fill', 'black')
 .style('fill-opacity', 1)
 .style('stroke', 'none')
 .style('text-shadow', '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff')
 .style('cursor', 'default')
 .style('user-select', 'none');
Expand All@@ -590,15 +591,14 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .append('text')
 .classed('axisTitle', true)
 .attr('text-anchor', 'middle')
 .style('font-family', 'sans-serif')
 .style('font-size', '10px')
 .style('cursor', 'ew-resize')
 .style('user-select', 'none')
 .style('pointer-events', 'auto');

 axisTitle
 .attr('transform', 'translate(0,' + -c.axisTitleOffset + ')')
 .text(function(d) {return d.label;});
 .text(function(d) {return d.label;})
 .each(function(d) {Drawing.font(axisTitle, d.model.labelFont);});

 var axisExtent = axisOverlays.selectAll('.axisExtent')
 .data(repeat, keyFun);
Expand DownExpand Up@@ -631,7 +631,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentTopText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain().slice(-1)[0]);})
 .each(function(d) {Drawing.font(axisExtentTopText, d.model.rangeFont);});

 var axisExtentBottom = axisExtent.selectAll('.axisExtentBottom')
 .data(repeat, keyFun);
Expand All@@ -653,7 +654,8 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
 .call(styleExtentTexts);

 axisExtentBottomText
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);});
 .text(function(d) {return formatExtreme(d)(d.domainScale.domain()[0]);})
 .each(function(d) {Drawing.font(axisExtentBottomText, d.model.rangeFont);});

 var axisBrush = axisOverlays.selectAll('.axisBrush')
 .data(repeat, keyFun);
Expand Down
Binary file modifiedtest/image/baselines/gl2d_parcoords.png

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

View file


Open in desktop

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

21 changes: 19 additions & 2 deletions
test/image/mocks/gl2d_parcoords_2.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
{
 "layout": {
 "width": 500,
 "height": 500
 "height": 500,
 "font": {
 "size": 15
 }
 },

 "data": [{
Expand All@@ -13,13 +16,27 @@
 "y": [0.2, 0.7]
 },

 "labelfont": {
 "color": "red",
 "size": 20
 },
 "tickfont": {
 "color": "blue"
 },
 "rangefont": {
 "color": "green"
 },

 "line": {
 "showscale": true,
 "reversescale": true,
 "colorscale": "Jet",
 "cmin": -4000,
 "cmax": -100,
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846]
 "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846],
 "colorbar": {
 "x": 1.1
 }
 },

 "dimensions": [
Expand Down

22 changes: 21 additions & 1 deletion
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,34 @@ describe('parcoords initialization tests', function() {
 expect(gd._fullData[0].opacity).toBeUndefined();
 });

 it('should use global font as label, tick and range font defaults', function() {
 var gd = Lib.extendDeep({}, mock1);
 gd.layout.font = {
 family: 'Gravitas',
 size: 20,
 color: 'blue'
 };

 Plots.supplyDefaults(gd);

 var expected = {
 family: 'Gravitas',
 size: 17,
 color: 'blue'
 };

 expect(gd._fullData[0].labelfont).toEqual(expected);
 expect(gd._fullData[0].tickfont).toEqual(expected);
 expect(gd._fullData[0].rangefont).toEqual(expected);
 });
 });

 describe('parcoords defaults', function() {

 function _supply(traceIn) {
 var traceOut = { visible: true },
 defaultColor = '#444',
 layout = { };
 layout = { font: Plots.layoutAttributes.font };

 Parcoords.supplyDefaults(traceIn, traceOut, defaultColor, layout);

Expand Down