Skip to content

Hoverlabel.zformat#2106

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 12 commits into from
Oct 26, 2017
Merged

Hoverlabel.zformat #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
acce9bf
Add hoverlabel.zformat attribute
jdugge Oct 15, 2017
b918176
Move property out of hoverlabel, use Axis.tickText for formatting, wr…
jdugge Oct 18, 2017
7a27542
Remove zformat from hoverlabels layout properties
jdugge Oct 18, 2017
919feea
Add zhoverformat to contour plots
jdugge Oct 19, 2017
5e20a48
Add zhoverformat to heatmap and contour traces
jdugge Oct 15, 2017
a24be4f
Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…
jdugge Oct 19, 2017
11f5edc
Merge branch 'master' into hoverlabel.zformat
jdugge Oct 20, 2017
86277f2
Fix formatting
jdugge Oct 20, 2017
1760d66
fixup choropleth select test
etpinard Oct 20, 2017
f991039
Merge pull request #2109 from plotly/fixup-choropleth-select-test
etpinard Oct 20, 2017
48509f3
Add zhoverformat to heatmap and contour traces
jdugge Oct 15, 2017
5c0b2f7
Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…
jdugge Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/fx/hover.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
d.yVal = d.ya.c2d(d.yLabelVal);
}
if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

// Traces like heatmaps generate the zLabel in their hoverPoints function
if(d.zLabelVal !== undefined && d.zLabel === undefined) {
d.zLabel = String(d.zLabelVal);
}

// for box means and error bars, add the range to the label
if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down
1 change: 1 addition & 0 deletions src/traces/contour/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
transpose: heatmapAttrs.transpose,
xtype: heatmapAttrs.xtype,
ytype: heatmapAttrs.ytype,
zhoverformat: heatmapAttrs.zhoverformat,

connectgaps: heatmapAttrs.connectgaps,

Expand Down
4 changes: 4 additions & 0 deletions src/traces/contour/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

handleContoursDefaults(traceIn, traceOut, coerce);
handleStyleDefaults(traceIn, traceOut, coerce, layout);

coerce('zhoverformat');
// Needed for formatting of hoverlabel if format is not explicitly specified
traceOut._separators = layout.separators;
};
11 changes: 11 additions & 0 deletions src/traces/heatmap/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
editType: 'plot',
description: 'Sets the vertical gap (in pixels) between bricks.'
},
zhoverformat: {
valType: 'string',
dflt: '',
role: 'style',
editType: 'none',
description: [
'Sets the hover text formatting rule using d3 formatting mini-languages',
'which are very similar to those in Python. See:',
'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
].join(' ')
},
},
colorscaleAttrs,
{ autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down
3 changes: 3 additions & 0 deletions src/traces/heatmap/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

coerce('zhoverformat');
traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};
16 changes: 16 additions & 0 deletions src/traces/heatmap/hover.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
y = cd0.y,
z = cd0.z,
zmask = cd0.zmask,
range = [trace.zmin, trace.zmax],
zhoverformat = trace.zhoverformat,
_separators = trace._separators,
x2 = x,
y2 = y,
xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
text = cd0.text[ny][nx];
}

var zLabel;
// dummy axis for formatting the z value
var dummyAx = {
type: 'linear',
range: range,
hoverformat: zhoverformat,
_separators: _separators
};
var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
zLabel = zLabelObj.text;

return [Lib.extendFlat(pointData, {
index: [ny, nx],
// never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
xLabelVal: xl,
yLabelVal: yl,
zLabelVal: zVal,
zLabel: zLabel,
text: text
})];
};
37 changes: 37 additions & 0 deletions test/jasmine/tests/hover_label_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
.catch(fail)
.then(done);
});

it('should display correct label content with specified format', function(done) {
var gd = createGraphDiv();

Plotly.plot(gd, [{
type: 'heatmap',
y: [0, 1],
z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
name: 'one',
zhoverformat: '.2f'
}, {
type: 'heatmap',
y: [2, 3],
z: [[1, 2, 3], [2, 2, 1]],
name: 'two'
}], {
width: 500,
height: 400,
margin: {l: 0, t: 0, r: 0, b: 0}
})
.then(function() {
_hover(gd, 250, 100);
assertHoverLabelContent({
nums: 'x: 1\ny: 3\nz: 2',
name: 'two'
});
})
.then(function() {
_hover(gd, 250, 300);
assertHoverLabelContent({
nums: 'x: 1\ny: 1\nz: 5.56',
name: 'one'
});
})
.catch(fail)
.then(done);
});
});

describe('hoverformat', function() {
Expand Down
9 changes: 5 additions & 4 deletions test/jasmine/tests/select_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
addInvisible(fig, false);

// add a trace with no locations which will then make trace invisible, lacking DOM elements
fig.data.push(Lib.extendDeep({}, fig.data[0]));
fig.data[1].text = [];
fig.data[1].locations = [];
fig.data[1].z = [];
var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
emptyChoroplethTrace.text = [];
emptyChoroplethTrace.locations = [];
emptyChoroplethTrace.z = [];
fig.data.push(emptyChoroplethTrace);

Plotly.plot(gd, fig)
.then(function() {
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" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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('^' + ".*" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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('^' + ".*" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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('^' + ".*" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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('^' + ".*" + '
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
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); }
})();
})();
Hoverlabel.zformat by jdugge · Pull Request #2106 · plotly/plotly.js · GitHub
Skip to content
Hoverlabel.zformat#2106

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 12 commits into

from

Oct 26, 2017
 Merged


Hoverlabel.zformat
#2106
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
acce9bf

Add hoverlabel.zformat attribute


jdugge Oct 15, 2017
b918176

Move property out of hoverlabel, use Axis.tickText for formatting, wr…


jdugge Oct 18, 2017
7a27542

Remove zformat from hoverlabels layout properties


jdugge Oct 18, 2017
919feea

Add zhoverformat to contour plots


jdugge Oct 19, 2017
5e20a48

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
a24be4f

Merge remote-tracking branch 'origin/hoverlabel.zformat' into hoverla…


jdugge Oct 19, 2017
11f5edc

Merge branch 'master' into hoverlabel.zformat


jdugge Oct 20, 2017
86277f2

Fix formatting


jdugge Oct 20, 2017
1760d66

fixup choropleth select test


etpinard Oct 20, 2017
f991039

Merge pull request #2109 from plotly/fixup-choropleth-select-test


etpinard Oct 20, 2017
48509f3

Add zhoverformat to heatmap and contour traces


jdugge Oct 15, 2017
5c0b2f7

Merge branch 'hoverlabel.zformat' of https://github.com/jdugge/plotly…


jdugge Oct 20, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
src/components/fx/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1073,7 +1073,11 @@ function cleanPoint(d, hovermode) {
 d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
 d.yVal = d.ya.c2d(d.yLabelVal);
 }
 if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

 // Traces like heatmaps generate the zLabel in their hoverPoints function
 if(d.zLabelVal !== undefined && d.zLabel === undefined) {
 d.zLabel = String(d.zLabelVal);
 }

 // for box means and error bars, add the range to the label
 if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
Expand Down

1 change: 1 addition & 0 deletions
src/traces/contour/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ module.exports = extendFlat({
 transpose: heatmapAttrs.transpose,
 xtype: heatmapAttrs.xtype,
 ytype: heatmapAttrs.ytype,
 zhoverformat: heatmapAttrs.zhoverformat,

 connectgaps: heatmapAttrs.connectgaps,

Expand Down

4 changes: 4 additions & 0 deletions
src/traces/contour/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout

 handleContoursDefaults(traceIn, traceOut, coerce);
 handleStyleDefaults(traceIn, traceOut, coerce, layout);

 coerce('zhoverformat');
 // Needed for formatting of hoverlabel if format is not explicitly specified
 traceOut._separators = layout.separators;
};

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,17 @@ module.exports = extendFlat({}, {
 editType: 'plot',
 description: 'Sets the vertical gap (in pixels) between bricks.'
 },
 zhoverformat: {
 valType: 'string',
 dflt: '',
 role: 'style',
 editType: 'none',
 description: [
 'Sets the hover text formatting rule using d3 formatting mini-languages',
 'which are very similar to those in Python. See:',
 'https://github.com/d3/d3-format/blob/master/README.md#locale_format'
 ].join(' ')
 },
},
 colorscaleAttrs,
 { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
Expand Down

3 changes: 3 additions & 0 deletions
src/traces/heatmap/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));

 colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

 coerce('zhoverformat');
 traceOut._separators = layout.separators; // Needed for formatting of hoverlabel if format is not explicitly specified
};

16 changes: 16 additions & 0 deletions
src/traces/heatmap/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

var Fx = require('../../components/fx');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');

var MAXDIST = Fx.constants.MAXDIST;

Expand All@@ -26,6 +27,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 y = cd0.y,
 z = cd0.z,
 zmask = cd0.zmask,
 range = [trace.zmin, trace.zmax],
 zhoverformat = trace.zhoverformat,
 _separators = trace._separators,
 x2 = x,
 y2 = y,
 xl,
Expand DownExpand Up@@ -99,6 +103,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 text = cd0.text[ny][nx];
 }

 var zLabel;
 // dummy axis for formatting the z value
 var dummyAx = {
 type: 'linear',
 range: range,
 hoverformat: zhoverformat,
 _separators: _separators
 };
 var zLabelObj = Axes.tickText(dummyAx, zVal, 'hover');
 zLabel = zLabelObj.text;

 return [Lib.extendFlat(pointData, {
 index: [ny, nx],
 // never let a 2D override 1D type as closest point
Expand All@@ -110,6 +125,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
 xLabelVal: xl,
 yLabelVal: yl,
 zLabelVal: zVal,
 zLabel: zLabel,
 text: text
 })];
};

37 changes: 37 additions & 0 deletions
test/jasmine/tests/hover_label_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -499,6 +499,43 @@ describe('hover info', function() {
 .catch(fail)
 .then(done);
 });

 it('should display correct label content with specified format', function(done) {
 var gd = createGraphDiv();

 Plotly.plot(gd, [{
 type: 'heatmap',
 y: [0, 1],
 z: [[1.11111, 2.2222, 3.33333], [4.44444, 5.55555, 6.66666]],
 name: 'one',
 zhoverformat: '.2f'
 }, {
 type: 'heatmap',
 y: [2, 3],
 z: [[1, 2, 3], [2, 2, 1]],
 name: 'two'
 }], {
 width: 500,
 height: 400,
 margin: {l: 0, t: 0, r: 0, b: 0}
 })
 .then(function() {
 _hover(gd, 250, 100);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 3\nz: 2',
 name: 'two'
 });
 })
 .then(function() {
 _hover(gd, 250, 300);
 assertHoverLabelContent({
 nums: 'x: 1\ny: 1\nz: 5.56',
 name: 'one'
 });
 })
 .catch(fail)
 .then(done);
 });
 });

 describe('hoverformat', function() {
Expand Down

9 changes: 5 additions & 4 deletions
test/jasmine/tests/select_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,10 +717,11 @@ describe('Test select box and lasso per trace:', function() {
 addInvisible(fig, false);

 // add a trace with no locations which will then make trace invisible, lacking DOM elements
 fig.data.push(Lib.extendDeep({}, fig.data[0]));
 fig.data[1].text = [];
 fig.data[1].locations = [];
 fig.data[1].z = [];
 var emptyChoroplethTrace = Lib.extendDeep({}, fig.data[0]);
 emptyChoroplethTrace.text = [];
 emptyChoroplethTrace.locations = [];
 emptyChoroplethTrace.z = [];
 fig.data.push(emptyChoroplethTrace);

 Plotly.plot(gd, fig)
 .then(function() {
Expand Down