Fix ellipse display.
Clean up.
Merge pull request #3300 from jburel/roi-ellipse

Roi ellipse