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.

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

Ellipse x y radius x radius y #6

Merged
merged 5 commits into from Jun 15, 2017

Conversation

will-moore
Copy link
Member

@will-moore will-moore commented Jun 13, 2017

Porting changes from OMERO.figure back to shape-editor.

This includes:

  • Renaming of ellipse attributes from cx, cy, rx, ry to x, y, radiusX, radiusY
  • Minor fix to the stroke-width of 2 Rectangles that are hidden from the user (used for click handling) as noticed and tested in slider range fix omero-figure#213

This is now up to date with what's in OMERO.figure, except for the reverted commits in ome/omero-figure#213 that can be in a future OMERO.figure PR.

It has already been tested in previous OMERO.figure PRs (primarily ome/omero-figure#190) and ome/omero-figure#213.

@will-moore
Copy link
Member Author

@jburel I guess I need to commit the same changes into the concatenated shape-editor.js too?

@jburel
Copy link
Member

jburel commented Jun 14, 2017

I have not modified the build yet so we still have the concatenated file under version control
if you run the build and push it that will be good
Since we have a number of renaming we will have to go for 3.0.0 version

@will-moore
Copy link
Member Author

will-moore commented Jun 14, 2017

Committed the concatenated shape-editor.js and updated this in ome/omero-figure#220 as version 3.0.0

@jburel
Copy link
Member

jburel commented Jun 15, 2017

@will-moore can you remove your last commit? there is already a .gitignore on master

@will-moore
Copy link
Member Author

Removed last commit.

@jburel jburel merged commit 4fc7fde into ome:master Jun 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants