Add spikelines#2247

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
etpinard merged 12 commits into from
Jan 17, 2018
Merged

Add spikelines #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
132b5b2
add crossline functionality
apalchys Nov 8, 2017
85714e8
fix crossline tests
apalchys Nov 9, 2017
cd83ecf
fix crossline tests
apalchys Nov 9, 2017
006b55d
move the search for crosslinePoints to ensure that the hoverLabels da…
apalchys Nov 9, 2017
b14286b
add spikedistance, hoverdistance, spikesnap
apalchys Dec 6, 2017
e5875a9
fix tests related to new spike mode
apalchys Dec 7, 2017
37e419f
fix hoverdistance and spikedistance when it set to 0
apalchys Dec 7, 2017
911ae0e
re-work spikeline based on PR review
apalchys Dec 19, 2017
751d527
add new tests and fix cursor
apalchys Jan 12, 2018
f562832
fix tests
apalchys Jan 12, 2018
6c2f368
fix issues after PR code review
apalchys Jan 17, 2018
f56413a
restore and update spikeline tests
apalchys Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
357 changes: 271 additions & 86 deletions src/components/fx/hover.js
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 22 additions & 1 deletion src/components/fx/layout_attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
editType: 'modebar',
description: 'Determines the mode of hover interactions.'
},

hoverdistance: {
valType: 'integer',
min: -1,
dflt: 20,
role: 'info',
editType: 'none',
description: [
'Sets the default distance (in pixels) to look for data',
'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
].join(' ')
},
spikedistance: {
valType: 'integer',
min: -1,
dflt: 20,
role: 'info',
editType: 'none',
description: [
'Sets the default distance (in pixels) to look for data to draw',
'spikelines to (-1 means no cutoff, 0 means no looking for data).'
].join(' ')
},
hoverlabel: {
bgcolor: {
valType: 'color',
Expand Down
6 changes: 5 additions & 1 deletion src/components/fx/layout_defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
}
else hovermodeDflt = 'closest';

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

// if only mapbox or geo subplots is present on graph,
// reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down
23 changes: 9 additions & 14 deletions src/components/modebar/buttons.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
var fullLayout = gd._fullLayout;
var aobj = {};
var axList = axisIds.list(gd, null, true);
var allEnabled = 'on';
var allSpikesEnabled = 'on';

var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
}
if(ax._showSpikeInitial !== undefined) {
aobj[axName + '.showspikes'] = ax._showSpikeInitial;
if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
}
}
}
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
}
}
}
fullLayout._cartesianSpikesEnabled = allEnabled;
fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
}
else {
// if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
val = fullLayout._isHoriz ? 'y' : 'x';
button.setAttribute('data-val', val);
if(val !== 'closest') {
fullLayout._cartesianSpikesEnabled = 'off';
}
} else if(astr === 'hovermode' && val === 'closest') {
for(i = 0; i < axList.length; i++) {
ax = axList[i];
if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
}
}
fullLayout._cartesianSpikesEnabled = allEnabled;
fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
}

aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
click: function(gd) {
var fullLayout = gd._fullLayout;

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

@etpinardetpinardJan 16, 2018

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.

@apalchysapalchysJan 17, 2018

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

@etpinardetpinardJan 17, 2018

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?


var aobj = setSpikelineVisibility(gd);

aobj.hovermode = 'closest';
Plotly.relayout(gd, aobj);
}
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
for(var i = 0; i < axList.length; i++) {
ax = axList[i];
axName = ax._name;
aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
}

return aobj;
Expand Down
10 changes: 5 additions & 5 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
var axList = axes.list(gd, '', true),
hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

for(var i = 0; i < axList.length; i++) {
var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
hasOneAxisChanged = true;
}

if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
}
}
gd._fullLayout._cartesianSpikesEnabled = allEnabled;
gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
top: pos,
bottom: pos,
left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,

@etpinardetpinardJan 16, 2018

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?

@apalchysapalchysJan 17, 2018

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

width: ax._length,
height: 0
};
Expand Down
8 changes: 8 additions & 0 deletions src/plots/cartesian/layout_attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
'plotted on'
].join(' ')
},
spikesnap: {
valType: 'enumerated',
values: ['data', 'cursor'],
dflt: 'data',
role: 'style',

@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.

@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.

editType: 'none',
description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
},
tickfont: fontAttrs({
editType: 'ticks',
description: 'Sets the tick font.'
Expand Down
23 changes: 17 additions & 6 deletions src/plots/cartesian/layout_defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
}

function coerce2(attr, dflt) {
return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
}

function getCounterAxes(axLetter) {
return (axLetter === 'x') ? yIds : xIds;
}
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

var showSpikes = coerce('showspikes');
if(showSpikes) {
coerce('spikecolor');
coerce('spikethickness');
coerce('spikedash');
coerce('spikemode');
var spikecolor = coerce2('spikecolor'),
spikethickness = coerce2('spikethickness'),
spikedash = coerce2('spikedash'),
spikemode = coerce2('spikemode'),
spikesnap = coerce2('spikesnap'),
showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

if(!showSpikes) {
delete axLayoutOut.spikecolor;
delete axLayoutOut.spikethickness;
delete axLayoutOut.spikedash;
delete axLayoutOut.spikemode;
delete axLayoutOut.spikesnap;
}

var positioningOptions = {
Expand Down
4 changes: 3 additions & 1 deletion src/traces/scatter/hover.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y
yLabelVal: di.y,

kink: Math.max(minRad, di.mrc || 0)
});

fillHoverText(di, trace, pointData);
Expand Down
Loading
, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading

, '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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 12 commits into

from

Jan 17, 2018
 Merged


Add spikelines
#2247
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
132b5b2

add crossline functionality


apalchys Nov 8, 2017
85714e8

fix crossline tests


apalchys Nov 9, 2017
cd83ecf

fix crossline tests


apalchys Nov 9, 2017
006b55d

move the search for crosslinePoints to ensure that the hoverLabels da…


apalchys Nov 9, 2017
b14286b

add spikedistance, hoverdistance, spikesnap


apalchys Dec 6, 2017
e5875a9

fix tests related to new spike mode


apalchys Dec 7, 2017
37e419f

fix hoverdistance and spikedistance when it set to 0


apalchys Dec 7, 2017
911ae0e

re-work spikeline based on PR review


apalchys Dec 19, 2017
751d527

add new tests and fix cursor


apalchys Jan 12, 2018
f562832

fix tests


apalchys Jan 12, 2018
6c2f368

fix issues after PR code review


apalchys Jan 17, 2018
f56413a

restore and update spikeline tests


apalchys Jan 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


357 changes: 271 additions & 86 deletions
src/components/fx/hover.js

View file


Open in desktop


Large diffs are not rendered by default.


23 changes: 22 additions & 1 deletion
src/components/fx/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,28 @@ module.exports = {
 editType: 'modebar',
 description: 'Determines the mode of hover interactions.'
 },

 hoverdistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data',
 'to add hover labels (-1 means no cutoff, 0 means no looking for data)'
 ].join(' ')
 },
 spikedistance: {
 valType: 'integer',
 min: -1,
 dflt: 20,
 role: 'info',
 editType: 'none',
 description: [
 'Sets the default distance (in pixels) to look for data to draw',
 'spikelines to (-1 means no cutoff, 0 means no looking for data).'
 ].join(' ')
 },
 hoverlabel: {
 bgcolor: {
 valType: 'color',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 }
 else hovermodeDflt = 'closest';

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

 // if only mapbox or geo subplots is present on graph,
 // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
Expand Down

23 changes: 9 additions & 14 deletions
src/components/modebar/buttons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ function handleCartesian(gd, ev) {
 var fullLayout = gd._fullLayout;
 var aobj = {};
 var axList = axisIds.list(gd, null, true);
 var allEnabled = 'on';
 var allSpikesEnabled = 'on';

 var ax, i;

Expand DownExpand Up@@ -209,8 +209,8 @@ function handleCartesian(gd, ev) {
 }
 if(ax._showSpikeInitial !== undefined) {
 aobj[axName + '.showspikes'] = ax._showSpikeInitial;
 if(allEnabled === 'on' && !ax._showSpikeInitial) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax._showSpikeInitial) {
allSpikesEnabled = 'off';
 }
 }
 }
Expand All@@ -230,24 +230,21 @@ function handleCartesian(gd, ev) {
 }
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }
 else {
 // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
 if(astr === 'hovermode' && (val === 'x' || val === 'y')) {
 val = fullLayout._isHoriz ? 'y' : 'x';
 button.setAttribute('data-val', val);
 if(val !== 'closest') {
 fullLayout._cartesianSpikesEnabled = 'off';
 }
 } else if(astr === 'hovermode' && val === 'closest') {
 for(i = 0; i < axList.length; i++) {
 ax = axList[i];
 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 fullLayout._cartesianSpikesEnabled = allEnabled;
 fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 }

 aobj[astr] = val;
Expand DownExpand Up@@ -551,12 +548,10 @@ modeBarButtons.toggleSpikelines = {
 click: function(gd) {
 var fullLayout = gd._fullLayout;

 fullLayout._cartesianSpikesEnabled = fullLayout.hovermode === 'closest' ?
 (fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on') : 'on';
 fullLayout._cartesianSpikesEnabled = fullLayout._cartesianSpikesEnabled === 'on' ? 'off' : 'on';
@etpinardetpinardJan 16, 2018

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.
@apalchysapalchysJan 17, 2018

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
@etpinardetpinardJan 17, 2018

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?

 var aobj = setSpikelineVisibility(gd);

 aobj.hovermode = 'closest';
 Plotly.relayout(gd, aobj);
 }
};
Expand All@@ -571,7 +566,7 @@ function setSpikelineVisibility(gd) {
 for(var i = 0; i < axList.length; i++) {
 ax = axList[i];
 axName = ax._name;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : false;
 aobj[axName + '.showspikes'] = fullLayout._cartesianSpikesEnabled === 'on' ? true : ax._showSpikeInitial;
 }

 return aobj;
Expand Down

10 changes: 5 additions & 5 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ axes.saveRangeInitial = function(gd, overwrite) {
axes.saveShowSpikeInitial = function(gd, overwrite) {
 var axList = axes.list(gd, '', true),
 hasOneAxisChanged = false,
allEnabled = 'on';
allSpikesEnabled = 'on';

 for(var i = 0; i < axList.length; i++) {
 var ax = axList[i];
Expand All@@ -415,11 +415,11 @@ axes.saveShowSpikeInitial = function(gd, overwrite) {
 hasOneAxisChanged = true;
 }

 if(allEnabled === 'on' && !ax.showspikes) {
allEnabled = 'off';
 if(allSpikesEnabled === 'on' && !ax.showspikes) {
allSpikesEnabled = 'off';
 }
 }
 gd._fullLayout._cartesianSpikesEnabled = allEnabled;
 gd._fullLayout._cartesianSpikesEnabled = allSpikesEnabled;
 return hasOneAxisChanged;
};

Expand DownExpand Up@@ -2048,7 +2048,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
 top: pos,
 bottom: pos,
 left: ax._offset,
rigth: ax._offset + ax._length,
right: ax._offset + ax._length,
@etpinardetpinardJan 16, 2018

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?
@apalchysapalchysJan 17, 2018

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
 width: ax._length,
 height: 0
 };
Expand Down

8 changes: 8 additions & 0 deletions
src/plots/cartesian/layout_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,14 @@ module.exports = {
 'plotted on'
 ].join(' ')
 },
 spikesnap: {
 valType: 'enumerated',
 values: ['data', 'cursor'],
 dflt: 'data',
 role: 'style',
@etpinardetpinardJan 16, 2018

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.

Though always debatable, all the new attributes you added should be role: 'info' as they do affect the behavior of the graph, not just the aesthetics.
@apalchysapalchysJan 17, 2018

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 for hoverdistance and spikedistance. Didn't change it for the spikesnap because all other axis properties (like showspikes and spikemode) have role style.
 editType: 'none',
 description: 'Determines whether spikelines are stuck to the cursor or to the closest datapoints.'
 },
 tickfont: fontAttrs({
 editType: 'ticks',
 description: 'Sets the tick font.'
Expand Down

23 changes: 17 additions & 6 deletions
src/plots/cartesian/layout_defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 return Lib.coerce(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function coerce2(attr, dflt) {
 return Lib.coerce2(axLayoutIn, axLayoutOut, layoutAttributes, attr, dflt);
 }

 function getCounterAxes(axLetter) {
 return (axLetter === 'x') ? yIds : xIds;
 }
Expand DownExpand Up@@ -139,12 +143,19 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {

 handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);

 var showSpikes = coerce('showspikes');
 if(showSpikes) {
 coerce('spikecolor');
 coerce('spikethickness');
 coerce('spikedash');
 coerce('spikemode');
 var spikecolor = coerce2('spikecolor'),
 spikethickness = coerce2('spikethickness'),
 spikedash = coerce2('spikedash'),
 spikemode = coerce2('spikemode'),
 spikesnap = coerce2('spikesnap'),
 showSpikes = coerce('showspikes', !!spikecolor || !!spikethickness || !!spikedash || !!spikemode || !!spikesnap);

 if(!showSpikes) {
 delete axLayoutOut.spikecolor;
 delete axLayoutOut.spikethickness;
 delete axLayoutOut.spikedash;
 delete axLayoutOut.spikemode;
 delete axLayoutOut.spikesnap;
 }

 var positioningOptions = {
Expand Down

4 changes: 3 additions & 1 deletion
src/traces/scatter/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,9 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {

 y0: yc - rad,
 y1: yc + rad,
 yLabelVal: di.y
 yLabelVal: di.y,

 kink: Math.max(minRad, di.mrc || 0)
 });

 fillHoverText(di, trace, pointData);
Expand Down
Loading