Used new generic region fill figure as super class for ROI shapes to fix
SCI-1861 and added special case handling for point regions