Skip to content

Annotation additions: standoff, anchor with arrow, clicktoshow #1265

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 14 commits into from
Jan 18, 2017
Merged

Annotation additions: standoff, anchor with arrow, clicktoshow #1265

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8518ee9
refactor annotations.draw, add standoff and anchor with arrow
alexcjohnson Dec 21, 2016
45bc0e3
build (and tweak) annotations baseline image
alexcjohnson Dec 22, 2016
d69ed98
fix annotation drawing when dragging off plot
alexcjohnson Dec 22, 2016
8f0038d
add some off-plot annotations to the test mock
alexcjohnson Dec 22, 2016
83482fb
only autorange on visible annotations
alexcjohnson Dec 23, 2016
9efa9b7
tweak Plotly.update logic
alexcjohnson Dec 23, 2016
9cf04b6
add clicktoshow for annotations
alexcjohnson Dec 23, 2016
2533ec5
lock mouse-change to 1.3.0
alexcjohnson Dec 24, 2016
578ea87
fix require caitalization setCursor -> setcursor
alexcjohnson Dec 24, 2016
d77ff15
Merge branch 'master' into note-align-standoff
alexcjohnson Jan 4, 2017
13947ef
update header on new annotations files
alexcjohnson Jan 4, 2017
582adfd
Merge branch 'master' into note-align-standoff
alexcjohnson Jan 18, 2017
b683903
put back original fullReplot/layoutReplot logic
alexcjohnson Jan 18, 2017
ccbffd0
fix and test overrideCursor
alexcjohnson Jan 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
2 changes: 1 addition & 1 deletion src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
// fill in redraw sequence
var seq = [];

if(restyleFlags.fullReplot && relayoutFlags.layoutReplot) {
if(restyleFlags.fullReplot || relayoutFlags.layoutReplot) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@etpinard am I missing something here? Seems like we would have noticed this before if it's a bug, but clicktoshow wouldn't work right without this change.

Copy link
Contributor

Choose a reason for hiding this comment

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

No. && looks correct here.

That if-else-block looks like:

if(restyleFlags.fullReplot && relayoutFlags.layoutReplot) {
  // full restyle and relayout update
}
else if(restyleFlags.fullReplot) {
  // full restyle update (but not relayout update)
}
else if(relayoutFlags.layoutReplot) {
    // full relayout update (but not restyle update)
}
else {
  // other more specific updates.
}

Maybe the problem is in layoutReplot?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ah OK - thanks, I missed that. I'll look into layoutReplot.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

alright, not sure what I was seeing earlier with layoutReplot / fullReplot, but putting back the && (b683903) doesn't seem to cause any issues now. Perhaps I fixed it in some other way in the meantime...

Copy link
Contributor

Choose a reason for hiding this comment

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

Great!

var data = gd.data,
layout = gd.layout;

Expand Down