Skip to content
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

Jump to bottom

Ternary phase diagrams #390

Merged
merged 79 commits into from
Apr 12, 2016
Merged

Ternary phase diagrams #390

Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
811c874
condense axisid, sceneid, geoid to subplotid
alexcjohnson Mar 11, 2016
2595731
first cut ternary layout attributes
alexcjohnson Mar 13, 2016
7e7e217
scatterternary attributes first cut
alexcjohnson Mar 13, 2016
6b4af04
handleSubplotDefaults (for gl3d, geo, and ternary... for now!)
alexcjohnson Mar 19, 2016
5cd86fc
ternary scaffolding
alexcjohnson Mar 19, 2016
aee10b6
tyop
alexcjohnson Mar 19, 2016
330574b
common axis.color
alexcjohnson Mar 20, 2016
2769e9c
break up tick_defaults -> tick_label_defaults, tick_mark_defalts
alexcjohnson Mar 22, 2016
1b9f43e
finish first cut ternary supplyLayoutDefaults
alexcjohnson Mar 22, 2016
4595ac6
coerce2 local func
alexcjohnson Mar 22, 2016
3ccc3ea
scatterternary supplyDefaults
alexcjohnson Mar 23, 2016
9ec6d8f
scatterternary calc
alexcjohnson Mar 23, 2016
abdce19
lib.filterVisible
alexcjohnson Mar 24, 2016
c2f7f71
ternary + scatterternary basic functionality
alexcjohnson Mar 30, 2016
f3e3f1e
Merge branch 'master' into ternary
alexcjohnson Mar 30, 2016
3f99890
ignore errorbars with scatterternary
alexcjohnson Mar 30, 2016
dc5cb63
fix colorbar defaults bug and update tests
alexcjohnson Mar 30, 2016
f43fe64
break up graph_interact
alexcjohnson Mar 30, 2016
c79d993
hover basic functionality (and much of the code for zoom/pan/select) …
alexcjohnson Mar 30, 2016
7dbd964
more ternary interaction futzing and fix scaling with nonzero mins
alexcjohnson Mar 30, 2016
c24e444
fix ternary zoom
alexcjohnson Mar 30, 2016
381de10
fix ternary pan
alexcjohnson Mar 30, 2016
c47d4f9
fix select on ternaryscatter
alexcjohnson Apr 1, 2016
17df3cd
collect Titles.draw calls to prep for refactoring
alexcjohnson Apr 2, 2016
637a956
robustify modebar logic and tests
alexcjohnson Apr 2, 2016
0857b44
refactor ugly logic out of Titles.draw
alexcjohnson Apr 2, 2016
c75051d
ternary axis titles
alexcjohnson Apr 2, 2016
e78818d
Merge branch 'master' into ternary
alexcjohnson Apr 2, 2016
07e8502
oops, something weird happened in merging axes.js - fix it
alexcjohnson Apr 3, 2016
c9ee322
_td -> _gd
alexcjohnson Apr 3, 2016
c88083c
fix dragElement requires
alexcjohnson Apr 3, 2016
0087ab8
bow to the :cow2:
alexcjohnson Apr 3, 2016
9dd02ee
fix interaction between axis.color and layout.font.color
alexcjohnson Apr 3, 2016
ee28402
linting / comment fixing
alexcjohnson Apr 4, 2016
515e121
robustify the robustification of graph_interact ternary check
alexcjohnson Apr 4, 2016
cdc6195
put back the fullLayout calculation instead of ._size for rangeslider…
alexcjohnson Apr 4, 2016
793afb3
fix wrong name in legend.draw
alexcjohnson Apr 4, 2016
c582d7f
updated size_margins test image for axis.color gridline default color…
alexcjohnson Apr 4, 2016
54cbb2f
remove commented code in gl3daxes_test
alexcjohnson Apr 4, 2016
a0e0cbd
comment on axis.color blending to grid color
alexcjohnson Apr 4, 2016
4eb83fb
Color.lightColor -> tinycolor.mix
alexcjohnson Apr 4, 2016
e08dce9
update scatterternary.text description
alexcjohnson Apr 4, 2016
a5d5969
perf scatterternary.calc
alexcjohnson Apr 4, 2016
408e3b0
oops, bug in my 3d mods, evidenced (but not created by) tinycolor.mix
alexcjohnson Apr 4, 2016
dae00af
scatterternary: don't treat [] array equivalent to undefined
alexcjohnson Apr 4, 2016
a15e9b6
lint axes.doTicks
alexcjohnson Apr 4, 2016
042cf3a
3d test image has better default gridline colors now, and fix 3d defa…
alexcjohnson Apr 4, 2016
f7b2447
jsdoc for titles.draw
alexcjohnson Apr 4, 2016
3974d11
remove single-use vars
alexcjohnson Apr 4, 2016
f9bb22e
Merge branch 'master' into ternary
etpinard Apr 11, 2016
06565e0
add test for lib/setcursor.js
etpinard Apr 6, 2016
670dc0d
add dragelment getCursor and align tests
etpinard Apr 6, 2016
aae3e47
add dragElement interaction tests
etpinard Apr 7, 2016
fbd0a0b
enforce no multiple empty lines at EOF (just eol-last is enough)
etpinard Apr 7, 2016
8cc59a9
add axis.color bleading test with 2d and 3d axes
etpinard Apr 8, 2016
e4e1019
add check for selectable scatterternary trace:
etpinard Apr 8, 2016
e3c0dd8
fix ternary + other sub plot type graphs:
etpinard Apr 8, 2016
324446d
add mode bar manger test for ternary plots
etpinard Apr 8, 2016
6a00fc2
add ternary simple mock
etpinard Apr 8, 2016
8338be6
properly delete clip defs from paper <svg>
etpinard Apr 8, 2016
dfcd6c3
add ternary test suite:
etpinard Apr 8, 2016
b37439e
fix typo (brings back ternary hover labels !!!)
etpinard Apr 11, 2016
e0c29f1
lint (mostly infix spacing)
etpinard Apr 11, 2016
ffa9d42
fix ternary domain vertical offset:
etpinard Apr 11, 2016
11e533b
update plot types mock (now with a ternary subplot)
etpinard Apr 11, 2016
f7d9c66
add ternary plot interaction tests
etpinard Apr 11, 2016
e99a5a6
add ternary defaults tests
etpinard Apr 12, 2016
eae47bb
fix scatterternary default logic:
etpinard Apr 12, 2016
277c8f8
add scatterteranry tests
etpinard Apr 12, 2016
6e38cca
fix typos in comments
etpinard Apr 12, 2016
6cefff0
sub fdescribe -> describe
etpinard Apr 12, 2016
6465c6c
add tick label and tick value attributes/default to ternary axes
etpinard Apr 12, 2016
e033d08
add three ternary image tests
etpinard Apr 12, 2016
a043655
set width to 1000
etpinard Apr 12, 2016
9d3776e
remove 'fill' and 'fillcolor' (for now):
etpinard Apr 12, 2016
ab22ef9
fix name hover label fill color:
etpinard Apr 12, 2016
c3ab79f
:camel: eats :snake:
etpinard Apr 12, 2016
6f8d468
add multiple ternary image test
etpinard Apr 12, 2016
fce4d68
bring back Fx.unhover (for backward compatible)
etpinard Apr 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plots/cartesian/graph_interact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ function hover(gd, evt, subplot) {
}),
yaArray = subplots.map(function(spId) {
var ternary = (gd._fullLayout[spId] || {})._ternary;
if(ternary) return ternary.xaxis;
if(ternary) return ternary.yaxis;
Copy link
Contributor

Choose a reason for hiding this comment

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

@alexcjohnson fyi.

return Plotly.Axes.getFromId(gd, spId, 'y');
}),
hovermode = evt.hovermode || fullLayout.hovermode;
Expand Down