masks transform along with color map (#988), plus some code cleanup

Resolves #988 (closed).

GUI/View/Overlay/EllipseOverlay.cpp

@@ -71,7 +71,7 @@ void EllipseOverlay::resizeY(double yl, double yh)
 
 //! updates position of view using item properties
 
-void EllipseOverlay::update_position()
+void EllipseOverlay::updatePosition()
 {
     setX(x2pix(m_item->xCenter()));
     setY(y2pix(m_item->yCenter()));
@@ -80,7 +80,7 @@ void EllipseOverlay::update_position()
         setTransform(QTransform().rotate(-1 * m_item->angle()));
 }
 
-QRectF EllipseOverlay::mask_rectangle()
+QRectF EllipseOverlay::maskRectangle()
 {
     return QRectF(-width() / 2, -height() / 2, width(), height());
 }