Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@apalchys@etpinard@alexcjohnson@lambone@wangyueming
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

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

Add spikelines - #2247

Merged
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline
Jan 17, 2018
Merged

Add spikelines#2247
etpinard merged 12 commits into
plotly:masterfrom
apalchys:crossline

Conversation

@apalchys

Copy link
Copy Markdown
Contributor

This PR adds support of spikelines in any hovermode.

Also some new properties were added:

  • spikedistance and hoverdistance to control the range of appearing of spikelines and hoverlabels;
  • spikesnap to control the placement of the spikelines point.

Note: only the cartesian type of axis supports new functionality.

Relates to #2155

@etpinard

Copy link
Copy Markdown
Contributor

I'll review this tomorrow am (UTC-5). Sorry for the wait.

@etpinardetpinard added bug something broken feature something new status: in progress labels Jan 15, 2018

@etpinardetpinard left a comment

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.

@apalchys amazing work!

To the best of my knowledge, this latest iteration has everything @alexcjohnson described in his #2155 (comment) done in a very clear and concise matter.

I found a few ways to make your additions to fx/hover.js even clearer. Let me know what you think!

My most blocking comments are the following:

  • declare hoverdistance and spikedistance with min: -1
  • clicking on spikes button an even number of times in the modebar should get the user back to the original settings

Just as an FYI, if you can addressed these issues before tomorrow night, this PR will be merged and released as part of 1.33.0 on Thursday.


hoverdistance: {
valType: 'integer',
min: 0,

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.

As Infinity isn't JSON-serializable, we declare attributes of the likes (e.g. hoverlabel.namelength) with min: -1, so that users can set hoverdistance: -1 for an infinite search radius. Morevover, hoverdistance: 0 should imply no hover labels/events, similarly for spikedistance.

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! Done.

role: 'style',
editType: 'none',
description: [
'Sets the default distance (in points) to look for data',

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 usually write (in pixels) instead of (in points) in our attribute descriptions.

Comment threadsrc/components/fx/layout_defaults.js Outdated
else hovermodeDflt = 'closest';

coerce('hovermode', hovermodeDflt);
coerce('hoverdistance');

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 could get fancy here by making this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverDistance)coerce('hoverdistance');

as hoverdistance is useless when hovermode: false.

Unfortunately, we can't add similar logic for spikedistance here as showspikes is per axis.

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.

Actually, we can, because if hovermode is false, we are not firing any hover events, so the spikelines are disabled too.
So we can write it like this:

varhoverMode=coerce('hovermode',hovermodeDflt);if(hoverMode){coerce('hoverdistance');coerce('spikedistance');}

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.

Good catch. Thanks!


fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
(fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';

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 might still need something similar here.

For example, with

varlayout={xaxis: {showspikes: true},yaxis: {showspikes: false}};

then click on toggleSpikeLines gives:

peek 2018-01-16 11-58

with no way to get back to the original behavior using the mode bar buttons.

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.

Done

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.

Great. Thanks!

Now, could you restore and update the modebar_test.js cases you removed in your first commit?

bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

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.

Good catch. Did this cause any bugs previously?

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.

It did in one of my early implementations

return result;
}

if(fullLayout._has('cartesian')) {

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.

Nice use of _has('cartesian') 👌

Comment threadsrc/components/fx/hover.js Outdated
}

function spikesChanged(gd, oldspikepoints) {
// don't emit any events if nothing changed

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.

Looks like this got copied from function hoverChanged() {}, but spike lines don't emit any events whatsoever. Would you mind 🔪 this line to avoid confusion.

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.

I use it to avoid the redrawing of the plot because of new spikelines if spikelines points didn't change

Comment threadsrc/components/fx/hover.js Outdated
if(closestVPoints.length) {
var closestVPt = closestVPoints[0];
if(isNumeric(closestVPt.x0) && isNumeric(closestVPt.y0)) {
tmpPoint = clearClosestPoint(closestVPt);

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.

This clearClosestPoint method is doing mostly initialisation as opposed to clearing something that exists already.

Would be mind rename it either initClosestPoint or fillClosestPoint? This would make it more aligned with the rest of our codebase.

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.

You are right, I've renamed it to fillClosestPoint.

Comment threadsrc/components/fx/hover.js Outdated
xpx = xa.c2p(xval),
ypx = ya.c2p(yval),
dxy = function(point) {
var rad = Math.max(3, point.mrc || 0),

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.

This Math.max(3, point.mrc || 0) only applies to scatter traces and is a duplicate of this line in scatter/hover.js.

Perhaps we should make the relevant traces/*/hover.js methods (I can think of scatter at the moment, but there might be more) add a .kink field to their output point data to not have to duplicate the somewhat tricky logic here again?

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.

Moved it to the point.kink property of the scatter/hover returned object.

Comment threadsrc/components/fx/hover.js Outdated
var xa,
ya;

var showY = closestPoints.hLinePoint ? true : false;

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.

maybe:

varshowY=!!closestPoints.hLinePoint;// orvarshowY=Boolean(closestPoints.hLinePoint);

would suffice?

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, changed it to var showY = !!closestPoints.hLinePoint;

@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard Thank you for the review! I fixed all highlighted issues. Please check.

@apalchys

Copy link
Copy Markdown
ContributorAuthor

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

hmm.. some test is failing but I can't reproduce it locally. Is it possible to re-run tests without commits?

Mmm, I think I've seen that one fail sporadically. You can't rerun the test, but we can...

@etpinard

Copy link
Copy Markdown
Contributor

Awesome @apalchys

Once the spike toggling modebar tests are restored and updated (#2247 (comment)), this PR will be good to merge!

@etpinard

Copy link
Copy Markdown
Contributor

Great PR. Thanks very much @apalchys

💃 💃 💃

@etpinard
etpinard merged commit e341edd into plotly:masterJan 17, 2018
@etpinardetpinard added this to the v1.33.0 milestone Jan 17, 2018
@apalchys

Copy link
Copy Markdown
ContributorAuthor

@etpinard@alexcjohnson Thank you for your help! 👍

@lambone

Copy link
Copy Markdown

I found it does not work for scattergl and because the pointData in function hoverPoints lacks of kink attribute.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@lambone see #2336 - I will include scattergl in the fix.

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@wangyueming

wangyueming commented Feb 23, 2018

Copy link
Copy Markdown

I checked the version 1.34.0, it does not work yet.

I made a simple fix in src/traces/scattergl/index.js.

 var minRad = (trace.mode.indexOf('markers') !== -1) ? 3 : 0.5;
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y,
// HACK add kink
kink: Math.max(minRad, di.mrc || 0),
cd: fakeCd
});

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@wangyueming#2379 was only merged 3 days ago. It will be in 1.35, likely next week.

@etpinardetpinard mentioned this pull request Oct 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@apalchys@etpinard@alexcjohnson@lambone@wangyueming