Shaping up

Restructured shapes classes into inheritance stuff so that different
shapes can be used to drawn in the integral

Also added options stuff and a recalculate function for Integral that
triggers Calculate