8000 Cartesian dropline support by rpaskowitz · Pull Request #1461 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Cartesian dropline support #1461

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
merged 30 commits into from
Apr 18, 2017
Merged

Cartesian dropline support #1461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d9fab15
Cartesian dropline support
rpaskowitz Mar 10, 2017
5d39b53
Removed chart config for showDroplines
rpaskowitz Mar 11, 2017
be47533
Add spikecolor, spikethickness, spikedash and spikemode
rpaskowitz Apr 7, 2017
17d815c
Add cartesian spikeline modebar support
rpaskowitz Apr 7, 2017
162068e
Merge branch 'master' into dropline
rpaskowitz Apr 7, 2017
762b54a
Move dashStyle to Drawing
rpaskowitz Apr 7, 2017
d680bd4
Name back to showspikes
rpaskowitz Apr 7, 2017
2433d4c
Lint, test and implementation fixes
rpaskowitz Apr 7, 2017
75da2fe
add spikeline icon
etpinard Apr 7, 2017
7953488
Fix cartesian check and fine-tune marker placement
rpaskowitz Apr 7, 2017
55b17b2
Merge branch 'master' into dropline
etpinard Apr 10, 2017
b9f6ab1
Refactor dropline to spikeline
rpaskowitz Apr 10, 2017
7fe4363
Merge branch 'dropline' of github.com:rpaskowitz/plotly.js into dropline
rpaskowitz Apr 10, 2017
34a1562
Switch from getBoundingClientRect to offsetLeft and offsetTop.
rpaskowitz Apr 10, 2017
8c7ac76
Move spike setup from axis to layout.
rpaskowitz Apr 10, 2017
6e243de
Fix marker positioning and across rendering for top-side x-axes.
rpaskowitz Apr 11, 2017
c036bf7
Merge branch 'master' into dropline
alexcjohnson Apr 13, 2017
08371c2
short-circuit redraw for spike attribute relayouts
alexcjohnson Apr 14, 2017
69dc781
fix manual-hover logic for event emitting
alexcjohnson Apr 14, 2017
8000
37b77fe
don't make spike markers crisp
alexcjohnson Apr 14, 2017
710d2d6
alter logic for where spikes start and end
alexcjohnson Apr 14, 2017
e509fa7
lint
alexcjohnson Apr 14, 2017
75121d2
:hocho: spikemode: 'none'
alexcjohnson Apr 17, 2017
bd11567
make drawing/attributes.dash - and clean up some dashes that don't fi…
alexcjohnson Apr 17, 2017
3a9aa58
short-circuit spike properties when spikes are off
alexcjohnson Apr 17, 2017
052417b
test hover event response to manual and "real" events
alexcjohnson Apr 17, 2017
a3a0a4f
:hocho: fit
alexcjohnson Apr 17, 2017
f7b467e
fix scattermapbox defaults for omitted options
alexcjohnson Apr 18, 2017
7aa4359
lint
alexcjohnson Apr 18, 2017
5925049
:hocho: :hocho:
alexcjohnson Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lint, test and implementation fixes
  • Loading branch information
@rpaskowitz
rpaskowitz committed Apr 7, 2017
commit 2433d4cb4da0e66524d186abf92a3a43761b3573
11 changes: 6 additions & 5 deletions src/plots/cartesian/axis_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
coerce('range');
containerOut.cleanRange();

coerce('showspikes');
coerce('spikecolor');
coerce('spikethickness');
coerce('spikedash');
coerce('spikemode');
if(coerce2('showspikes')) {
coerce2('spikecolor');
coerce2('spikethickness');
coerce2('spikedash');
coerce2('spikemode');
}

handleTickValueDefaults(containerIn, containerOut, coerce, axType);
handleTickLabelDefaults(containerIn, containerOut, coerce, axType, options);
Expand Down
17 changes: 9 additions & 8 deletions src/plots/cartesian/graph_interact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,9 +591,10 @@ function hover(gd, evt, subplot) {

gd._hoverdata = newhoverdata;

if(hoverChanged(gd, evt, oldhoverdata)) {
if(hoverChanged(gd, evt, oldhoverdata) && gd._hasCartesian) {
var droplineOpts = {
hovermode: hovermode,
fullLayout: fullLayout,
container: fullLayout._hoverlayer,
outerContainer: fullLayout._paperdiv
};
Expand Down Expand Up @@ -860,15 +861,15 @@ function createDroplines(hoverData, opts) {
yAnchoredBase = yEdge - outerBBox.top,
xBase = c0.ya.anchor === 'free' ? xFreeBase : xAnchoredBase,
yBase = c0.xa.anchor === 'free' ? yFreeBase : yAnchoredBase,
contrastColor = Color.combine(fullLayout.plot_bgcolor, fullLayout.paper_bgcolor),
contrastColor = Color.combine(opts.fullLayout.plot_bgcolor, opts.fullLayout.paper_bgcolor),
xColor = c0.xa.spikecolor ? c0.xa.spikecolor : (
tinycolor.readability(c0.color,contrastColor) < 1.5 ? (
tinycolor(c0.color).getBrightness() > 128 ? '#000' : Color.background)
: c0.color),
tinycolor.readability(c0.color, contrastColor) < 1.5 ? (
tinycolor(c0.color).getBrightness() > 128 ? '#000' : Color.background) :
c0.color),
yColor = c0.ya.spikecolor ? c0.ya.spikecolor : (
tinycolor.readability(c0.color,contrastColor) < 1.5 ? (
tinycolor(c0.color).getBrightness() > 128 ? '#000' : Color.background)
: c0.color),
tinycolor.readability(c0.color, contrastColor) < 1.5 ? (
tinycolor(c0.color).getBrightness() > 128 ? '#000' : Color.background) :
c0.color),
xThickness = c0.xa.spikethickness,
yThickness = c0.ya.spikethickness,
xDash = Drawing.dashStyle(c0.xa.spikedash, xThickness),
Expand Down
0