Changed gAPainter classes so you can plot both triangles and circles