-
Notifications
You must be signed in to change notification settings - Fork 153
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.
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
Drag other selections #657
Drag other selections #657
Conversation
Probably best to remove #641 to keep the reviews straight |
So the following scenario is annoying at the moment:
A few possible ways to address this:
thoughts? |
Ah I see you prefer to bundle #641 into this PR. That's fine |
if hdu.data.shape != reference_shape: | ||
raise Exception("HDUs are not all the same dimensions") | ||
|
||
return hdulist | ||
return valid_hdus |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these changes look fine to me
Ewww, yes, the circle should behave has the other shapes. Also agree on the global use of the escape key. And will look into the stale ROI issue.
|
@stscieisenhamer - just a minor nit, but if possible, it would be great to get rid of the merge commits by doing a rebase (I think there won't be any conflicts?). In general, you can keep the history cleaner by rebasing instead of merging. |
Oops, sorry, will do the rebase. Just getting back to the other two points above, after which rebase will occur. |
…glue into drag_other_selections
OK. The three issues have been dealt with. And I think I've done the rebase, though next time I'll make sure to start with rebasing. So, should be ready for another review. |
@@ -502,6 +512,10 @@ def contains(self, x, y): | |||
result.shape = x.shape | |||
return result | |||
|
|||
def move_to(self, xdelta, ydelta): | |||
self.vx = map(lambda x: x + xdelta, self.vx) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wrap these in list() to preserve python3 compatibility
Looks good to me, pending the python3 issue! |
Fixed abort_selection logic to not abort if there is no state to abort.
Bug when closing tab and pressing cancel
Question of procedure: should I merge or is there something else that need be done? |
@stscieisenhamer - it would be good to rebase to get rid of the merge commits (it doesn't look like the rebase before worked). Could you try again? Normally when you rebase against the upstream master, it should automatically remove the merge commits. (Procedure wise, as long as @ChrisBeaumont and I have signed off and said it's fine to merge, it doesn't matter who actually merges) |
Fixed abort_selection logic to not abort if there is no state to abort.
…glue into drag_other_selections
Think I've gotten out of the 'rebase cycle' and have successfully (?) done that. Just a question of the coverage test fail; I haven't dealt with that before and if pointed in the right direction will rectify. |
@stscieisenhamer the coverage test fails when the overall unit test coverage decreases. It would be great if you can add some unit tests for the new functions you added, in Let me know if you need guidance running the test suite locally (see https://github.com/glue-viz/glue/blob/master/.travis.yml#L122) |
Nice! |
This allows the dragging of the Circular and Polygon (lasso) selections, as with Rectangle, resolving #651
Note also this has the fix in PR #641 by accident. I can remove if desired.